Changeset 25211

Timestamp:

2012-03-12T21:18:11+13:00 (12 years ago)

Author:

ak19

Message:

Correction to the test for java (now calling java -version, not just java) so that JDK 1.7 also returns the same result for the positive test as JDK 1.6.

File:

• gs2-extensions/pdf-box/trunk/java/perllib/plugins/PDFBoxConverter.pm (modified) (1 diff)

gs2-extensions/pdf-box/trunk/java/perllib/plugins/PDFBoxConverter.pm

@@ -59 +59 @@
     }
     else {
-        # test to see if java is in path     
-        my $cmd = "java";
+        # test to see if java is in path
+        # Need to run java -version instead of just java, since the %ERRORLEVEL% returned
+        # for `java` (which is checked below for failure of the command) is 0 for JDK 1.6*
+        # while %ERRORLEVEL% is 1 for JDK 1.7*
+        # If `java -version` is run however, %ERRORLEVEL% returned is 0 if java is 
+        # installed, regardless of whether the JDK version is 1.6* or 1.7*.
+        my $cmd = "java -version";
         if ($ENV{'GSDLOS'} =~ /^windows/i) {
         $cmd .= " >nul 2>&1"; # java 2>&1 >null or java >null 2>&1 both work (%ERRORLEVEL% is 0)