mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small refactor

Browse Source 
Change-Id: I25fb8a769cd5e97863e5bd9fabae670589e4a18a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156018
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski
2023-08-23 12:35:55 +03:00
parent 8711197ac6
commit a3ce697e10
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
stoc/source/javavm/javavm.cxx
View File

@@ -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;