diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-11-16 23:03:09 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-11-16 23:47:09 +0100 |
| commit | 36c8fd8995f4e1c8439a69dde1f55e45e674d7b2 (patch) | |
| tree | 1f2a4863c5e98d9a277b6624e260ecca6183de7f /jvmfwk | |
| parent | 9f36f90b614007540fbcc1db850e00ca5f73c14d (diff) | |
Clean up jfw_findAllJREs return value computation
Change-Id: Iace2281ec4b5cfaa6e1de44b58a6705ca3a18c58
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/source/framework.cxx | 7 |
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( |