diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-10 19:21:15 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-10 21:42:31 +0100 |
| commit | 8e9a7cac42d554402a6ead3a83ae8b7defc9247b (patch) | |
| tree | 9905516c3e7ca3cc6de020e8cc36d84adb650a29 /jvmfwk/source | |
| parent | Turn JavaInfo sal_Sequence* member into rtl::ByteSequence (diff) | |
| download | core-8e9a7cac42d554402a6ead3a83ae8b7defc9247b.tar.gz core-8e9a7cac42d554402a6ead3a83ae8b7defc9247b.zip | |
No more need for jfw_freeJavaInfo
Change-Id: I2426a76936b4099a243ce8c102da867e7868aac3
Diffstat (limited to 'jvmfwk/source')
| -rw-r--r-- | jvmfwk/source/framework.cxx | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 6f9c45584d94..88658a18175f 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -427,7 +427,7 @@ javaFrameworkError jfw_findAndSelectJRE(JavaInfo **pInfo) { bInfoFound = true; } - jfw_freeJavaInfo(pHomeInfo); + delete pHomeInfo; } // if no Java installation providing all features was detected by using JAVA_HOME, @@ -460,7 +460,7 @@ javaFrameworkError jfw_findAndSelectJRE(JavaInfo **pInfo) aCurrentInfo = pJInfo; } - jfw_freeJavaInfo(pJInfo); + delete pJInfo; } ++it; } @@ -529,7 +529,7 @@ javaFrameworkError jfw_findAndSelectJRE(JavaInfo **pInfo) //The array returned by jfw_plugin_getAllJavaInfos must be freed as well as //its contents for (int j = 0; j < cInfos; j++) - jfw_freeJavaInfo(arInfos[j]); + delete arInfos[j]; rtl_freeMemory(arInfos); if (bInfoFound) @@ -642,12 +642,6 @@ bool jfw_areEqualJavaInfo(JavaInfo const * pInfoA,JavaInfo const * pInfoB) return false; } - -void jfw_freeJavaInfo(JavaInfo *pInfo) -{ - delete pInfo; -} - javaFrameworkError jfw_getSelectedJRE(JavaInfo **ppInfo) { javaFrameworkError errcode = JFW_E_NONE; @@ -805,7 +799,7 @@ javaFrameworkError jfw_setSelectedJRE(JavaInfo const *pInfo) jfw::setJavaSelected(); } - jfw_freeJavaInfo(currentInfo); + delete currentInfo; } catch (const jfw::FrameworkException& e) { @@ -1051,7 +1045,7 @@ CJavaInfo CJavaInfo::createWrapper(::JavaInfo* info) } void CJavaInfo::attach(::JavaInfo * info) { - jfw_freeJavaInfo(pInfo); + delete pInfo; pInfo = info; } ::JavaInfo * CJavaInfo::detach() @@ -1063,7 +1057,7 @@ void CJavaInfo::attach(::JavaInfo * info) CJavaInfo::~CJavaInfo() { - jfw_freeJavaInfo(pInfo); + delete pInfo; } @@ -1085,7 +1079,7 @@ CJavaInfo & CJavaInfo::operator = (const CJavaInfo& info) if (&info == this) return *this; - jfw_freeJavaInfo(pInfo); + delete pInfo; pInfo = copyJavaInfo(info.pInfo); return *this; } @@ -1094,7 +1088,7 @@ CJavaInfo & CJavaInfo::operator = (const ::JavaInfo* info) if (info == pInfo) return *this; - jfw_freeJavaInfo(pInfo); + delete pInfo; pInfo = copyJavaInfo(info); return *this; } |