Changeset 30765 for main/trunk

Timestamp:

2016-08-26T17:21:27+12:00 (8 years ago)

Author:

davidb

Message:

More forgiving test for java vendor

File:

• main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -306 +306 @@
             // check that we are using Sun Java
             String java_vendor = System.getProperty("java.vendor");
-            if (!java_vendor.equals("Sun Microsystems Inc.")) {
+            if (!java_vendor.equals("Sun Microsystems Inc.")
+                && !java_vendor.equals("Oracle Corporation")) {
                 System.err.println(Dictionary.get("General.NotSunJava", java_vendor));
             }