jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 12 ++++++++++++ 1 file changed, 12 insertions(+)
New commits: commit 034c9b8adf358fd0b076d93f2603bf8ebc20bbdc Author: ilhan <[email protected]> AuthorDate: Wed Mar 25 11:18:09 2020 +0100 Commit: Thorsten Behrens <[email protected]> CommitDate: Thu Apr 16 16:39:38 2020 +0200 tdf#131399 Update java settings after slight java version change Under linux, the version is now also checked for changes at startup of libreoffice. Change-Id: I572f718cf5afc83a70d98a6897f1d3d6877644f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91037 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 6b6af620ff53209487a146aa3977db328c3a6300) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92025 Tested-by: Thorsten Behrens <[email protected]> Reviewed-by: Thorsten Behrens <[email protected]> diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index cd024b1ac2c8..f1fe15b5fcc5 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -859,6 +859,18 @@ javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, bool *exist) *exist = true; JFW_TRACE2("Java runtime library exist: " << sRuntimeLib); + // Check version + rtl::Reference<VendorBase> aVendorInfo = getJREInfoByPath(sLocation); + if (!aVendorInfo.is()) + { + *exist = false; + JFW_TRACE2("JRE or supported vendor not accessible at location: " << sLocation); + } + else if(pInfo->sVersion!=aVendorInfo->getVersion()) + { + *exist = false; + JFW_TRACE2("Mismatch between version number in libreoffice settings and installed JRE: " << pInfo->sVersion <<" != " << aVendorInfo->getVersion()); + } } else if (::osl::File::E_NOENT == rc_itemRt) { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
