diff options
Diffstat (limited to 'jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 9071bc6fa3b5..0bd412408b3b 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -103,7 +103,7 @@ OString getPluginJarPath( SunVersion ver142("1.4.2-ea"); SunVersion ver150("1.5.0-ea"); SunVersion ver(sVersion); - assert(ver142 && ver150 && ver); + OSL_ASSERT(ver142 && ver150 && ver); OUString sName; if (ver < ver142) @@ -139,7 +139,7 @@ OString getPluginJarPath( sPath = sPath1 + OUString::createFromAscii(sep) + sPath2; } } - assert(!sPath.isEmpty()); + OSL_ASSERT(!sPath.isEmpty()); } ret = OUStringToOString(sPath, osl_getThreadTextEncoding()); @@ -301,7 +301,7 @@ javaPluginError jfw_plugin_getAllJavaInfos( { assert(parJavaInfo); - assert(!sVendor.isEmpty()); + OSL_ASSERT(!sVendor.isEmpty()); if (sVendor.isEmpty()) return javaPluginError::InvalidArg; @@ -349,11 +349,11 @@ javaPluginError jfw_plugin_getJavaInfoByPath( std::unique_ptr<JavaInfo> * ppInfo) { assert(ppInfo != nullptr); - assert(!sPath.isEmpty()); + OSL_ASSERT(!sPath.isEmpty()); if (sPath.isEmpty()) return javaPluginError::InvalidArg; - assert(!sVendor.isEmpty()); + OSL_ASSERT(!sVendor.isEmpty()); if (sVendor.isEmpty()) return javaPluginError::InvalidArg; @@ -688,7 +688,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( reinterpret_cast<JNI_CreateVM_Type *>(moduleRt.getFunctionSymbol(sSymbolCreateJava)); if (!pCreateJavaVM) { - assert(false); + OSL_ASSERT(false); OString sLib = OUStringToOString( sRuntimeLib, osl_getThreadTextEncoding()); OString sSymbol = OUStringToOString( |