Changeset 31590 for main

Timestamp:

2017-04-07T11:00:30+12:00 (7 years ago)

Author:

ak19

Message:

Better synchronization I think. I've declared methods as synchronized, to make sure that the EventListeners are synchronized on too, rather than synchronizing only on the BufferedWriter object.

File:

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

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

@@ -658 +658 @@
     // exceptions when reading from our perl process' stderr and stdout streams are handled by
     // SynchronizedProcessLineByLineHandler.gotException() below.
-    public void gotException(Exception e) {
+    public synchronized void gotException(Exception e) {
 
     // do what original runPerlCommand() code always did when an exception occurred
@@ -688 +688 @@
     }
 
-    public void gotLine(String line) {
+    public synchronized void gotLine(String line) {
         //if(this.source == STDERR) {
         ///System.err.println("ERROR: " + line);
@@ -701 +701 @@
         // "All methods on Logger are multi-thread safe", see
         // http://stackoverflow.com/questions/14211629/java-util-logger-write-synchronization
-
-        try {
-        synchronized(bwHandle) { // get a lock on the writer handle, then write
+        
+        try {       
+        bwHandle.write(line + "\n");
         
-            bwHandle.write(line + "\n");
-        } 
         } catch(IOException ioe) {
         String msg = (source == STDERR) ? "stderr" : "stdout";
@@ -716 +714 @@
         // and only immutable (final) vars are used.
         sendProcessStatus(new ConstructionEvent(GS2PerlConstructor.this, GSStatus.CONTINUING, line));
-    }   
+    }
 
     // This is called when we get an exception during the processing of a perl's
     // input-, err- or output stream
-    public void gotException(Exception e) {
+    public synchronized void gotException(Exception e) {
         String msg = (source == STDERR) ? "stderr" : "stdout";
         msg = "Got exception when processing the perl process' " + msg + " stream.";