From b9ecede5762831ff590a33cd04dc7cb381307000 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 17 Nov 2021 13:36:19 +0100
Subject: 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>
---
 jvmfwk/source/framework.cxx | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'jvmfwk')

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