Changeset 15012 for gli/trunk

Timestamp:

2008-02-27T16:28:31+13:00 (16 years ago)

Author:

davidb

Message:

br.readLine() could return null in test for ImageMagick -- threw exception on Windows version for me -- code modified to test for this being null and returning false if so, before it continues with rest of test for ImageMagick

File:

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

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

@@ -1160 +1160 @@
         //new way of detection of ImageMagick
         InputStreamReader isr = new InputStreamReader(image_magick_process.getInputStream());
+
             BufferedReader br = new BufferedReader(isr);
             // Capture the standard output stream and seach for two particular occurances: Version and ImageMagick.
-            String line = br.readLine().toLowerCase();
-        if (line.indexOf("version") != -1 || line.indexOf("imagemagick") != -1) {
+
+            String line = br.readLine();
+        if (line == null) {
+            return false;
+        }
+            String lc_line = line.toLowerCase();
+        if (lc_line.indexOf("version") != -1 || lc_line.indexOf("imagemagick") != -1) {
             return true;
         } else {
                 return false;
         }
+
         //return (image_magick_process.exitValue() == 0);
         }