summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2021-11-17 13:36:19 +0100
committerStephan Bergmann <sbergman@redhat.com>2021-11-17 15:46:44 +0100
commitb9ecede5762831ff590a33cd04dc7cb381307000 (patch)
treedf10db05b5c86ba3f5dae791712cfa59f5befdae /jvmfwk
parent013ec5ef7ac038b6b1b8b937e81880f30434098a (diff)
Don't fail jfw_findAllJREs for just one JRE of WrongArch
...otherwise if one such JRE had found its way into a user's configuration, "Tools - Options... - LibreOffice - Advanced" would no longer show *any* JREs. Regression introduced with 9143dd4ebe37b608e43d04434cf831624bf55b65 "Related tdf#54443 List only matching JREs", which added WrongArch to the javaPluginError enum. Change-Id: I51fd47e585c6686be7a9282615c0978e4f6c460b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125396 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/source/framework.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 40bbf629a36f..200724b5483f 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -101,6 +101,8 @@ javaFrameworkError jfw_findAllJREs(std::vector<std::unique_ptr<JavaInfo>> *pparI
continue;
if (plerr == javaPluginError::FailedVersion)
continue;
+ if (plerr == javaPluginError::WrongArch)
+ continue;
else if (plerr != javaPluginError::NONE)
return JFW_E_ERROR;