stoc/source/javavm/javavm.cxx | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit dbe0ad486c60bde96b7f8019f31d855e3eae545b
Author: Mike Kaganski <[email protected]>
AuthorDate: Sun Jul 30 19:46:02 2023 +0300
Commit: Mike Kaganski <[email protected]>
CommitDate: Mon Jul 31 16:46:12 2023 +0200
tdf#156161: Honor "DontEnableJava" when failed because selected JRE
uninstalled
Change-Id: Id90f530fda9e565a5a53853a3acb8195035a80ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155078
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <[email protected]>
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 96fdd61401fc..305ebe290d34 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -690,6 +690,9 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8
> const & rProcessId)
}
}
+ if (comphelper::IsContextFlagActive("DontEnableJava"))
+ return css::uno::Any();
+
//Error: %PRODUCTNAME requires a Java
//runtime environment (JRE) to perform this task. The selected JRE
//is defective. Please select another version or install a new JRE
