stoc/source/javavm/javavm.cxx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
New commits: commit f12d6b76b6dd80c81a4d9902593ef5c762a3af73 Author: Mike Kaganski <mike.kagan...@collabora.com> AuthorDate: Wed Aug 23 10:13:58 2023 +0300 Commit: Mike Kaganski <mike.kagan...@collabora.com> CommitDate: Wed Aug 23 10:54:13 2023 +0200 tdf#156701: Move DontEnableJava handling into askForRetry Change-Id: I0deeed09fcea765e66c1967f40d60a1222f90c08 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155964 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 305ebe290d34..b68813e5ffae 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -128,6 +128,9 @@ static void destroyAttachGuards(void * pData) bool askForRetry(css::uno::Any const & rException) { + if (comphelper::IsContextFlagActive("DontEnableJava")) + return false; + css::uno::Reference< css::uno::XCurrentContext > xContext( css::uno::getCurrentContext()); if (xContext.is()) @@ -650,9 +653,6 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) } case JFW_E_JAVA_DISABLED: { - if (comphelper::IsContextFlagActive("DontEnableJava")) - return css::uno::Any(); - //QueryBox: //%PRODUCTNAME requires a Java runtime environment (JRE) to perform //this task. However, use of a JRE has been disabled. Do you want to @@ -690,9 +690,6 @@ 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