summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-10-28 11:17:10 +0200
committerMichael Stahl <mstahl@redhat.com>2016-10-28 11:46:05 +0000
commit541febffd9d6f367e23081a1f0d095f232325014 (patch)
treea95efb00473d6497fc492117c42eb0b6e6e18f16 /jvmfwk
parentab909cde6ad7e3aad6c70b9784dcb5ebde3c48b3 (diff)
tdf#103507 quickfix: Automatic selection of Oracle Java runtime on Windows
...which had been broken since 5e9a2e9b0f33ab50aa3a84728db75383aede19d9 "Check each potential JRE location only once", as jfw_findAndSelectJRE calls jfw_plugin_getAllJavaInfos on each vendor in turn, but that now only operates on any items newly added by addAllJREInfos, so the first call to jfw_plugin_getAllJavaInfos (with sVendor being "Sun Microsystems Inc." unsuccesfully operated on all items, and the next call (with sVendor being "Oracle Corporation") didn't see any further items to operate on. So the quickfix (at least for any Java runtimes by Oracle) is to reorder the vendors in javavendors_wnt.xml. The proper fix will be to reorder the code so it obtains the list of all Java runtimes only once, and then matches that list against the known vendors. (Other plaforms appear not to be affected by this issue. Some jvmfwk/distributions/OpenOfficeorg/javavendors_*.xml already sort Oracle first, anyway. And e.g. on Linux, jfw_findAndSelectJRE typically already succeeds with calling jfw_plugin_getJavaInfosFromPath and so doesn't reach the problematic code. Change-Id: Ied571ae1d4745d53ce0c8697d0f1b268e1aac407 Reviewed-on: https://gerrit.libreoffice.org/30349 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index b1ad4e49f3e7..330461094180 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -23,12 +23,12 @@
<updated>2013-05-02</updated>
<vendorInfos>
- <vendor name="Sun Microsystems Inc.">
- <minVersion>1.5.0</minVersion>
- </vendor>
<vendor name="Oracle Corporation">
<minVersion>1.6.0</minVersion>
</vendor>
+ <vendor name="Sun Microsystems Inc.">
+ <minVersion>1.5.0</minVersion>
+ </vendor>
<vendor name="IBM Corporation">
<minVersion>1.5.0</minVersion>
</vendor>