Changeset 18729 for greenstone3/trunk/src/java/org/greenstone/server/RunTarget.java

Timestamp:

2009-03-20T17:15:36+13:00 (15 years ago)

Author:

ak19

Message:

Dr Bainbridge made some corrections in here in the run() method, such as closing the stream reader, and reorganising the code.

File:

• greenstone3/trunk/src/java/org/greenstone/server/RunTarget.java (modified) (1 diff)

greenstone3/trunk/src/java/org/greenstone/server/RunTarget.java

@@ -36 +36 @@
          BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream()));
          String line = null;
-             while (!(line = br.readLine()).startsWith(targetFinished)){
-                 
+             
+         while ((line = br.readLine()) != null) {
+
+         logger.info(line);
+
          if (line.equals(targetSuccess)){
              state = 0;
          }
-     
+         
          if (line.equals(targetFailed)){
              state = 1; 
-                  }
-         logger.info(line);
-         }    
+         }
+
+         if(line.startsWith(targetFinished)){
+             break;      
+         }
+         }
+         
+         br.close();
+
+         if(state < 0) {
+         logger.info("Unexpected end of input when running target: " + targetCmd);
+         }
      } catch (Exception e) {
          e.printStackTrace();