revert OSL_ASSERT changes

Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380

3 files changed, 9 insertions, 9 deletions

diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index a57af9ad2374..353eab37ba6f 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -51,7 +51,7 @@ OString getElement(OString const & docPath,
                         xmlChar const * pathExpression, bool bThrowIfEmpty)
 {
     //Prepare the xml document and context
-    assert(!docPath.isEmpty());
+    OSL_ASSERT(!docPath.isEmpty());
      jfw::CXmlDocPtr doc(xmlParseFile(docPath.getStr()));
     if (doc == nullptr)
         throw FrameworkException(
@@ -712,7 +712,7 @@ void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo)
     OString sExcMsg("[Java framework] Error in function NodeJavaInfo::loadFromNode "
                          "(elements.cxx).");
 
-    assert(pJavaInfo && pDoc);
+    OSL_ASSERT(pJavaInfo && pDoc);
     if (pJavaInfo->children == nullptr)
         return;
     //Get the xsi:nil attribute;
@@ -829,7 +829,7 @@ void CNodeJavaInfo::writeToNode(xmlDoc* pDoc,
                                 xmlNode* pJavaInfoNode) const
 
 {
-    assert(pJavaInfoNode && pDoc);
+    OSL_ASSERT(pJavaInfoNode && pDoc);
     //write the attribute vendorSettings
 
     //javaInfo@vendorUpdate
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 9dd836a5b806..ddc5e6c19747 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -239,7 +239,7 @@ javaFrameworkError jfw_startVM(
                     "-Djava.class.path=" + jfw::BootParams::getClasspath();
             }
             else
-                assert(false);
+                OSL_ASSERT(false);
             pInfo = aInfo.get();
         }
         assert(pInfo != nullptr);
@@ -299,7 +299,7 @@ javaFrameworkError jfw_startVM(
             g_pJavaVM = pVm;
             *ppVM = pVm;
         }
-        assert(plerr != javaPluginError::WrongVendor);
+        OSL_ASSERT(plerr != javaPluginError::WrongVendor);
     }
     catch (const jfw::FrameworkException& e)
     {
@@ -667,7 +667,7 @@ javaFrameworkError jfw_getJavaInfoByPath(OUString const & pPath, std::unique_ptr
             {// plugin does not recognize this path as belonging to JRE
                 continue;
             }
-            assert(false);
+            OSL_ASSERT(false);
         }
         if (!*ppInfo && errcode != JFW_E_FAILED_VERSION)
             errcode = JFW_E_NOT_RECOGNIZED;
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index 226673356cd5..dbab7d4a9e7a 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -120,7 +120,7 @@ VendorSettings::VendorSettings():
 
 VersionInfo VendorSettings::getVersionInformation(const OUString & sVendor)
 {
-    assert(!sVendor.isEmpty());
+    OSL_ASSERT(!sVendor.isEmpty());
     VersionInfo aVersionInfo;
     OString osVendor = OUStringToOString(sVendor, RTL_TEXTENCODING_UTF8);
     //Get minVersion
@@ -436,7 +436,7 @@ JFW_MODE getMode()
 
 OUString getApplicationClassPath()
 {
-    assert(getMode() == JFW_MODE_APPLICATION);
+    OSL_ASSERT(getMode() == JFW_MODE_APPLICATION);
     OUString retVal;
     OUString sParams = BootParams::getClasspathUrls();
     if (sParams.isEmpty())
@@ -453,7 +453,7 @@ OUString getApplicationClassPath()
             OUString systemPathElement;
             oslFileError rc = osl_getSystemPathFromFileURL(
                 token.pData, &systemPathElement.pData );
-            assert( rc == osl_File_E_None );
+            OSL_ASSERT( rc == osl_File_E_None );
             if (rc == osl_File_E_None && !systemPathElement.isEmpty())
             {
                 if (buf.getLength() > 0)