Changeset 31631 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java

Timestamp:

2017-04-21T20:00:54+12:00 (7 years ago)

Author:

ak19

Message:

Further changes to SafeProcess to turn some interfaces to abstract classes. Corresponding changes to GS2PerlConstructor which makes use of this.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java (modified) (7 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java

@@ -485 +485 @@
         // handle each incoming line from stdout and stderr streams, and any exceptions that occur then
         SafeProcess.CustomProcessHandler processOutHandler
-        = new SynchronizedProcessHandler(bw, SynchronizedProcessHandler.STDOUT);
+        = new SynchronizedProcessHandler(bw, SafeProcess.STDOUT);
         SafeProcess.CustomProcessHandler processErrHandler
-        = new SynchronizedProcessHandler(bw, SynchronizedProcessHandler.STDERR);
+        = new SynchronizedProcessHandler(bw, SafeProcess.STDERR);
         
         // GS2PerlConstructor will do further handling of exceptions that may occur during the perl
@@ -700 +700 @@
     // exceptions when reading from our perl process' stderr and stdout streams are handled by
     // SynchronizedProcessHandler.gotException() below, since they happen in separate threads
-    // from this one (the ine from which the perl process is run).
+    // from this one (the one from which the perl process is run).
     public synchronized void gotException(Exception e) {
 
@@ -719 +719 @@
     // we do that here too, to continue original behaviour. These calls are also synchronized to make their
     // use of the EventListeners threadsafe.
-    protected class SynchronizedProcessHandler implements SafeProcess.CustomProcessHandler
+    protected class SynchronizedProcessHandler extends SafeProcess.CustomProcessHandler
     {
-    public static final int STDERR = 0;
-    public static final int STDOUT = 1;
-
-    private final int source;
     private final BufferedWriter bwHandle; // needs to be final to synchronize on the object
         
-
     public SynchronizedProcessHandler(BufferedWriter bw, int src) {
+        super(src); // will set this.source to STDERR or STDOUT
         this.bwHandle = bw; // caller will close bw, since many more than one
                             // SynchronizedProcessHandlers are using it
-        this.source = src; // STDERR or STDOUT
     }
 
@@ -751 +746 @@
 
 
-            //if(this.source == STDERR) {
+            //if(this.source == SafeProcess.STDERR) {
             ///System.err.println("ERROR: " + line);
             //} else {
@@ -767 +762 @@
             } 
             } catch(IOException ioe) {
-            String msg = (source == STDERR) ? "stderr" : "stdout";
+            String msg = (this.source == SafeProcess.STDERR) ? "stderr" : "stdout";
             msg = "Exception when writing out a line read from perl process' " + msg + " stream.";
             GS2PerlConstructor.logger.error(msg, ioe);
@@ -780 +775 @@
         } catch (IOException ioe) { // problem with reading in from process with BufferedReader br
 
-        String msg = (source == STDERR) ? "stderr" : "stdout";
+        String msg = (this.source == SafeProcess.STDERR) ? "stderr" : "stdout";
         msg = "Got exception when processing the perl process' " + msg + " stream.";
         GS2PerlConstructor.logger.error(msg, ioe);
@@ -821 +816 @@
         // http://stackoverflow.com/questions/14211629/java-util-logger-write-synchronization
         
-        String msg = (source == STDERR) ? "stderr" : "stdout";
+        String msg = (this.source == SafeProcess.STDERR) ? "stderr" : "stdout";
         msg = "IOException when writing out a line read from perl process' " + msg + " stream.";
         msg += "\nGot line: " + line + "\n";