summaryrefslogtreecommitdiff
path: root/jvmfwk/source/framework.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-03-10 17:32:48 +0100
committerStephan Bergmann <sbergman@redhat.com>2016-03-10 21:41:24 +0100
commit8546831b3b36e29c1ee42b790cbecd3fd8d8bbaf (patch)
treeef67dc83a9484c999ff1937469a582cff506ae2e /jvmfwk/source/framework.cxx
parent5dcdb35ab1e99dbeb283d3694ab7ebba354e9197 (diff)
Turn JavaInfo sal_Sequence* member into rtl::ByteSequence
Change-Id: Iecd476970b0b7a46afe223f71e95b0010048d7b1
Diffstat (limited to 'jvmfwk/source/framework.cxx')
-rw-r--r--jvmfwk/source/framework.cxx12
1 files changed, 2 insertions, 10 deletions
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index a6cac212bd67..6f9c45584d94 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -630,13 +630,12 @@ bool jfw_areEqualJavaInfo(JavaInfo const * pInfoA,JavaInfo const * pInfoB)
return true;
if (pInfoA == nullptr || pInfoB == nullptr)
return false;
- rtl::ByteSequence sData(pInfoA->arVendorData);
if (pInfoA->sVendor == pInfoB->sVendor
&& pInfoA->sLocation == pInfoB->sLocation
&& pInfoA->sVersion == pInfoB->sVersion
&& pInfoA->nFeatures == pInfoB->nFeatures
&& pInfoA->nRequirements == pInfoB->nRequirements
- && sData == pInfoB->arVendorData)
+ && pInfoA->arVendorData == pInfoB->arVendorData)
{
return true;
}
@@ -646,9 +645,6 @@ bool jfw_areEqualJavaInfo(JavaInfo const * pInfoA,JavaInfo const * pInfoB)
void jfw_freeJavaInfo(JavaInfo *pInfo)
{
- if (pInfo == nullptr)
- return;
- rtl_byte_sequence_release(pInfo->arVendorData);
delete pInfo;
}
@@ -1073,11 +1069,7 @@ CJavaInfo::~CJavaInfo()
JavaInfo * CJavaInfo::copyJavaInfo(const JavaInfo * pInfo)
{
- if (pInfo == nullptr)
- return nullptr;
- JavaInfo* newInfo = new JavaInfo(*pInfo);
- rtl_byte_sequence_acquire(newInfo->arVendorData);
- return newInfo;
+ return pInfo == nullptr ? nullptr : new JavaInfo(*pInfo);
}