ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#131399 Update java settings after slight java version change

Browse Source 
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 <michael.stahl@cib.de>
This commit is contained in:
ilhan
2020-03-27 17:46:51 +01:00
committed by Michael Stahl
parent 319407dba6
commit 6b6af620ff
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+12
View File
@@ -867,6 +867,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)
{