diff options
| author | ilhan <ilhanyesil@gmx.de> | 2020-03-25 11:18:09 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-04-02 21:41:44 +0200 |
| commit | 44a40091ae960a10ef88f16f04138989366017fd (patch) | |
| tree | 3c2ee0626bc00f6dc785326d1ed6317c516a1636 /jvmfwk | |
| parent | 55d423e8f371e914c51f9aa18aacede46355b133 (diff) | |
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 <michael.stahl@cib.de>
(cherry picked from commit 6b6af620ff53209487a146aa3977db328c3a6300)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91405
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 128de9b352b0..4760ab629313 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -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) { |