summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/source/framework.cxx7
1 files changed, 2 insertions, 5 deletions
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 81fd3fc076da..94f7c2cc1019 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -49,11 +49,9 @@ bool areEqualJavaInfo(
javaFrameworkError jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSize)
{
- javaFrameworkError retVal = JFW_E_NONE;
try
{
osl::MutexGuard guard(jfw::FwkMutex::get());
- javaFrameworkError errcode = JFW_E_NONE;
if (pparInfo == nullptr || pSize == nullptr)
return JFW_E_INVALID_ARG;
@@ -186,15 +184,14 @@ javaFrameworkError jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSize)
(*pparInfo)[index++] = l->detach();
*pSize = nSize;
- return errcode;
+ return JFW_E_NONE;
}
catch (const jfw::FrameworkException& e)
{
- retVal = e.errorCode;
fprintf(stderr, "%s\n", e.message.getStr());
OSL_FAIL(e.message.getStr());
+ return e.errorCode;
}
- return retVal;
}
javaFrameworkError jfw_startVM(