3 files changed, 9 insertions, 17 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 89e1a49bd1ed..e69420334736 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -146,9 +146,7 @@ OString getPluginJarPath(
 
 JavaInfo* createJavaInfo(const rtl::Reference<VendorBase> & info)
 {
-    JavaInfo* pInfo = static_cast<JavaInfo*>(rtl_allocateMemory(sizeof(JavaInfo)));
-    if (pInfo == nullptr)
-        return nullptr;
+    JavaInfo* pInfo = new JavaInfo;
     OUString sVendor = info->getVendor();
     pInfo->sVendor = sVendor.pData;
     rtl_uString_acquire(sVendor.pData);
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 3e9f478c58ea..60a1fa5cbe21 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -977,9 +977,7 @@ JavaInfo * CNodeJavaInfo::makeJavaInfo() const
 {
     if (bNil || m_bEmptyNode)
         return nullptr;
-    JavaInfo * pInfo = static_cast<JavaInfo*>(rtl_allocateMemory(sizeof(JavaInfo)));
-    if (pInfo == nullptr)
-        return nullptr;
+    JavaInfo * pInfo = new JavaInfo;
     memset(pInfo, 0, sizeof(JavaInfo));
     pInfo->sVendor = sVendor.pData;
     rtl_uString_acquire(pInfo->sVendor);
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index f28092a59b28..e70e831e54b2 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -655,7 +655,7 @@ void jfw_freeJavaInfo(JavaInfo *pInfo)
     rtl_uString_release(pInfo->sLocation);
     rtl_uString_release(pInfo->sVersion);
     rtl_byte_sequence_release(pInfo->arVendorData);
-    rtl_freeMemory(pInfo);
+    delete pInfo;
 }
 
 javaFrameworkError jfw_getSelectedJRE(JavaInfo **ppInfo)
@@ -1081,16 +1081,12 @@ JavaInfo * CJavaInfo::copyJavaInfo(const JavaInfo * pInfo)
 {
     if (pInfo == nullptr)
         return nullptr;
-    JavaInfo* newInfo =
-          static_cast<JavaInfo*>(rtl_allocateMemory(sizeof(JavaInfo)));
-    if (newInfo)
-    {
-        memcpy(newInfo, pInfo, sizeof(JavaInfo));
-        rtl_uString_acquire(pInfo->sVendor);
-        rtl_uString_acquire(pInfo->sLocation);
-        rtl_uString_acquire(pInfo->sVersion);
-        rtl_byte_sequence_acquire(pInfo->arVendorData);
-    }
+    JavaInfo* newInfo = new JavaInfo;
+    memcpy(newInfo, pInfo, sizeof(JavaInfo));
+    rtl_uString_acquire(pInfo->sVendor);
+    rtl_uString_acquire(pInfo->sLocation);
+    rtl_uString_acquire(pInfo->sVersion);
+    rtl_byte_sequence_acquire(pInfo->arVendorData);
     return newInfo;
 }