diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-05-08 13:10:46 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-05-08 13:10:46 +0200 |
| commit | f5ed2f4e926016d23617355c94dd2292b40e6986 (patch) | |
| tree | 7b52be3ac021236cdb6f09a28f18183e97b226c8 /jvmfwk | |
| parent | 5a8b1b16de62bf595df7927891d539691ac26a89 (diff) | |
Resolves: rhbz#1092589 Thoroughly check whether JRE is still present
...not only on Mac OS X. Was able to reproduce this on Fedora 20 where current
JRE was /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.5.x86_64 but for whatever reason
there was also a left-behind /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.0.x86_64 tree
(containing just a handful of sub-dirs, but no real content) that was still
recorded in my ~/.config/libreoffice/4/user/config/javasettings_Linux_X86_64.xml
Change-Id: Ie477c5a506a430f6c29525f6c558dbc18bbf1c48
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 0069aec74251..ca816cb23595 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -772,10 +772,10 @@ javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist) { ret = JFW_PLUGIN_E_ERROR; } -#ifdef MACOSX //We can have the situation that the JavaVM runtime library is not //contained within JAVA_HOME. Then the check for JAVA_HOME would return //true although the runtime library may not be loadable. + //Or the JAVA_HOME directory of a deinstalled JRE left behind. if (ret == JFW_PLUGIN_E_NONE && *exist == sal_True) { OUString sRuntimeLib = getRuntimeLib(pInfo->arVendorData); @@ -803,7 +803,6 @@ javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist) + sRuntimeLib + " \n"); } } -#endif return ret; } |