[Libreoffice-commits] core.git: stoc/source

[Mike Kaganski (via logerrit)]

 stoc/source/javavm/javavm.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit a3ce697e10a63d96cd081979b0f134239305a7cc
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Aug 23 12:35:55 2023 +0300
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Aug 24 08:53:58 2023 +0200

    Small refactor
    
    Change-Id: I25fb8a769cd5e97863e5bd9fabae670589e4a18a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156018
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index b68813e5ffae..091bb7779eeb 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -594,7 +594,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 
> const & rProcessId)
         }
 
         JNIEnv * pMainThreadEnv = nullptr;
-        javaFrameworkError errcode = JFW_E_NONE;
+        javaFrameworkError errcode;
 
         if (getenv("STOC_FORCE_NO_JRE"))
             errcode = JFW_E_NO_SELECT;
@@ -610,9 +610,11 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 
> const & rProcessId)
         {
             // No Java configured. We silently run the Java configuration
             info.reset();
-            javaFrameworkError errFind = jfw_findAndSelectJRE(&info);
+            javaFrameworkError errFind;
             if (getenv("STOC_FORCE_NO_JRE"))
                 errFind = JFW_E_NO_JAVA_FOUND;
+            else
+                errFind = jfw_findAndSelectJRE(&info);
             if (errFind == JFW_E_NONE)
             {
                 continue;