Kaydet (Commit) 36c8fd89 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Clean up jfw_findAllJREs return value computation

Change-Id: Iace2281ec4b5cfaa6e1de44b58a6705ca3a18c58
üst 9f36f90b
......@@ -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(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment