Fix detection of Java versions > 1.8

Patch by: me git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1863883 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 779db4a)
apache · Aug 5, 2019 · 9fbe012 · 9fbe012
1 parent 76c3a0c
commit 9fbe012
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
@@ -75,6 +75,7 @@ char const* const* OtherInfo::getRuntimePaths(int * size)
         "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", // for Blackdown AMD64
         "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so", // for Blackdown PPC
         "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so", // for Java of BEA Systems
+        "/lib/server/libjvm.so",                     // > 1.8
         "/bin/classic/libjvm.so", // fallback for older for IBM Java
         "/jre/bin/classic/libjvm.so" // fallback for older for IBM Java
 #endif
@@ -102,7 +103,8 @@ char const* const* OtherInfo::getLibraryPaths(int* size)
         "/lib/" JFW_PLUGIN_ARCH "/classic",
         "/lib/" JFW_PLUGIN_ARCH "/jrockit",
         "/lib/" JFW_PLUGIN_ARCH "/native_threads",
-        "/lib/" JFW_PLUGIN_ARCH
+        "/lib/" JFW_PLUGIN_ARCH,
+        "/lib" // > 1.8
 #endif
     };
 

diff --git a/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -75,7 +75,8 @@ char const* const* SunInfo::getRuntimePaths(int * size)
         "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
         "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
         "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so",
-        "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so"
+        "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so",
+        "/lib/server/libjvm.so" // > 1.8
 #endif
     };
     *size = sizeof(ar) / sizeof (char*);
@@ -89,7 +90,8 @@ char const* const* SunInfo::getLibraryPaths(int* size)
 
         "/lib/" JFW_PLUGIN_ARCH "/client",
         "/lib/" JFW_PLUGIN_ARCH "/native_threads", 
-        "/lib/" JFW_PLUGIN_ARCH
+        "/lib/" JFW_PLUGIN_ARCH,
+        "/lib" // > 1.8
 
     };
     *size = sizeof(ar) / sizeof (char*);