[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - jvmfwk/plugins
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 610a6a4e262868381677838fdd3571e22adee12e
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu May 8 13:10:46 2014 +0200
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
(cherry picked from commit f5ed2f4e926016d23617355c94dd2292b40e6986)
Reviewed-on: https://gerrit.libreoffice.org/9279
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index a3449c3..d3650f9 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -765,10 +765,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);
@@ -796,7 +796,6 @@ javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo,
sal_Bool *exist)
+ sRuntimeLib + \n);
}
}
-#endif
return ret;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - jvmfwk/plugins
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 09749c7751e4c12a898f0c2f98b0c71ebe67ba6d Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 11 18:36:42 2014 +0100 Don't set JAVA_HOME on Mac OS X ...for one, it doesn't appear necessary there (needed for awt), and for another setting it according to Oracle's JRE 7 would prevent a subsequent visit to the Advanced preferences pane from listing Apple's JRE 6, as launching that java and reading its system properties would be fooled by the JAVA_HOME and report the Oracle system properties instead. Change-Id: I02d82de6113b44b3cae3fb55cd83177fe852d769 (cherry picked from commit 237d2c923b77479dbdf07db7bd926c45b01b8fc8) Reviewed-on: https://gerrit.libreoffice.org/8005 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 981b827..a3449c3 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -588,7 +588,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( return JFW_PLUGIN_E_VM_CREATION_FAILED; } -#ifdef UNX +#if defined UNX !defined MACOSX //Setting the JAVA_HOME is needed for awt OUString javaHome(JAVA_HOME=); OUString sPathLocation; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - jvmfwk/plugins
jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx |8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
New commits:
commit 4cf524e07e1b0355b418c19eae0dbf8771fb12be
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Feb 11 14:10:43 2014 +0100
Related fdo#74597: Java on Mac doesn't use javaldx/library path fiddling
...so no need to return non-empty SunInfo::getLibraryPaths (for the Oracle
JRE,
cf. how this had always returned an empty set for the Apple JRE in
otherjre.cxx).
This fixes the bug that selecting the Oracle JRE in the Advanced options
pane
didn't stick, because jfw_areEqualJavaInfo was called on a JavaInfo read
back
from XML where nRequirements had been cleared (in
CNodeJavaInfo::loadFromNode)
and a JavaInfo where non-empty SunInfo::getLibraryPaths -
VendorBase::needsRestart() == true - nRequirements ==
JFW_REQUIRE_NEEDRESTART,
so always returned false.
(There's multiple errors here. It is questionable whether
jfw_areEqualJavaInfo
should take nRequirements into account, at least when used from
SvxJavaOptionsPage. And VendorBase::getLibraryPaths appears to be only
used to
compute VendorBase::needsRestart, ignoring the actual path data. But leave
that
for future clean-up.)
Change-Id: I5f004434b1cb7e909a153c43c474a2317f24b0c1
(cherry picked from commit 6c697a99c90a40492eb8c16466a2082cc2be927e)
Reviewed-on: https://gerrit.libreoffice.org/7997
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 180bbb9..e38ecf8 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -76,18 +76,12 @@ char const* const* SunInfo::getRuntimePaths(int * size)
char const* const* SunInfo::getLibraryPaths(int* size)
{
-#if defined UNX
+#if defined UNX !defined MACOSX
static char const * ar[] = {
-#if defined MACOSX defined X86_64
-// Oracle Java 7, under /Library/Internet
Plug-Ins/JavaAppletPlugin.plugin/Contents/Home
-/lib/server,
-/lib
-#else
/lib/ JFW_PLUGIN_ARCH /client,
/lib/ JFW_PLUGIN_ARCH /server,
/lib/ JFW_PLUGIN_ARCH /native_threads,
/lib/ JFW_PLUGIN_ARCH
-#endif
};
*size = SAL_N_ELEMENTS(ar);
return ar;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
