avoid duplicating last log on terminate

Ajay Kannan · Ajay Kannan · commit 8e595a7d5770 · 2015-10-16T11:54:53.000-07:00
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/testing/LocalGcdHelper.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/testing/LocalGcdHelper.java
@@ -239,7 +239,6 @@ private static class ProcessErrorStreamReader extends Thread {
 
     void terminate() throws IOException {
       terminated = true;
-      writeLog(currentLogLevel, currentLog);
       errorReader.close();
     }
 
@@ -253,14 +252,14 @@ public void run() {
           nextLine = errorReader.readLine();
           if (nextLine == null) {
             terminated = true;
-            writeLog(currentLogLevel, currentLog);
           } else {
             processLogLine(previousLine, nextLine);
           }
         } catch (IOException e) {
           // ignore
         }
       }
+      writeLog(currentLogLevel, currentLog);
     }
 
     private void processLogLine(String previousLine, String nextLine) {

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,6 @@ private static class ProcessErrorStreamReader extends Thread {`
`239`	`239`
`240`	`240`	`void terminate() throws IOException {`
`241`	`241`	`terminated = true;`
`242`		`- writeLog(currentLogLevel, currentLog);`
`243`	`242`	`errorReader.close();`
`244`	`243`	`}`
`245`	`244`
`@@ -253,14 +252,14 @@ public void run() {`
`253`	`252`	`nextLine = errorReader.readLine();`
`254`	`253`	`if (nextLine == null) {`
`255`	`254`	`terminated = true;`
`256`		`- writeLog(currentLogLevel, currentLog);`
`257`	`255`	`} else {`
`258`	`256`	`processLogLine(previousLine, nextLine);`
`259`	`257`	`}`
`260`	`258`	`} catch (IOException e) {`
`261`	`259`	`// ignore`
`262`	`260`	`}`
`263`	`261`	`}`
	`262`	`+ writeLog(currentLogLevel, currentLog);`
`264`	`263`	`}`
`265`	`264`
`266`	`265`	`private void processLogLine(String previousLine, String nextLine) {`