From 36c8fd8995f4e1c8439a69dde1f55e45e674d7b2 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 16 Nov 2016 23:03:09 +0100
Subject: Clean up jfw_findAllJREs return value computation

Change-Id: Iace2281ec4b5cfaa6e1de44b58a6705ca3a18c58
---
 jvmfwk/source/framework.cxx | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'jvmfwk/source')

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(
-- 
cgit