[Libreoffice-commits] core.git: jvmfwk/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Sun Jun 21 23:22:24 UTC 2020
jvmfwk/source/framework.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 642fc41cd7d080384658e10b30bb9d3b38a2cbd9
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sun Jun 21 23:34:31 2020 +0200
Commit: Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Mon Jun 22 01:21:44 2020 +0200
tdf#134167: jfw_plugin_getAllJavaInfos can successfully return empty list
Regression introduced with 6ba74150866d71469827de9f4f19268dfa7db137
"jfw::isAccessibilitySupportDesired is obsolete"
Change-Id: I696f3240fa8760ae156ac3b8b1fd1fe42f81c539
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96821
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index c253eec65426..2457ef3ee4c8 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -327,9 +327,8 @@ javaFrameworkError jfw_findAndSelectJRE(std::unique_ptr<JavaInfo> *pInfo)
& arInfos,
infos);
- if (plerr == javaPluginError::NONE)
+ if (plerr == javaPluginError::NONE && !arInfos.empty())
{
- assert(!arInfos.empty());
aCurrentInfo = std::move(arInfos[0]);
}
More information about the Libreoffice-commits
mailing list