Changeset 15307 for other-projects/trunk/gs3-webservices-democlient/CheckJavaVersion.java

Timestamp:

2008-04-30T16:42:33+12:00 (16 years ago)

Author:

ak19

Message:

Improved to deal with the case of minimum JavaVersion = 1.5.0_10_12 and 1.5.0_9_12 when running Java version = 1.5.0_10. In the first case it should not be acceptable and in the last it should be.

File:

• other-projects/trunk/gs3-webservices-democlient/CheckJavaVersion.java (modified) (3 diffs)

other-projects/trunk/gs3-webservices-democlient/CheckJavaVersion.java

@@ -11 +11 @@
      * mentioned. If arg[0] is left out as well, then Greenstone3's
      * minimum default version of 1.4.x is assumed.
-     * The program exits with -1 if the Java version being used is 
-     * incompatible and with 0 if it is acceptable.
+     * The program exits with 1 if the Java version being used is 
+     * incompatible and with 2 if it is acceptable.
      */
     public static void main(String[] args) {
@@ -51 +51 @@
         boolean acceptable = true;
         // only keep looping while we haven't gone past the end of either array
-        for(int i=0; i < minVersionNums.length && i < runningVersionNums.length; i++)
+        int i=0;
+        for(; i < minVersionNums.length && i < runningVersionNums.length; i++)
         {
             int min = Integer.parseInt(minVersionNums[i]);
@@ -63 +64 @@
         }
         
+        // Consider minVersion = 1.5.0_10 and runningVersion = 1.5.0
+        // this means the runningversion is still insufficient. 
+        // HOWEVER, minVersion being longer does not always mean it is
+        // a later version, consider: min=1.5.0_9.12 and run=1.5.0_10
+        // This should be acceptable since 10 > 9 even though min is longer.
+        // SOLUTION: If the last values for both were the same, the running 
+        // Version is not compatible if the minVersionNums array is longer
+        int min = Integer.parseInt(minVersionNums[i-1]);
+        int run = Integer.parseInt(runningVersionNums[i-1]);
+        
+        // if the last values were the same, check whether min is longer
+        // in which case the running version is not acceptable
+        if(min == run && minVersionNums.length > runningVersionNums.length) 
+        {
+            acceptable = false;
+        }
+        
         if(acceptable) {
             System.out.println("Found compatible Java version " +runningJavaVersion);
-            System.exit(0); // acceptable case
+            System.exit(2); // acceptable case
         } else {
             System.out.println("The current Java version " + 
                 runningJavaVersion + " is insufficient to run " + programName);
-            System.exit(-1);
+            System.exit(1);
         } 
     }