---

Ajay Kannan · Ajay Kannan · commit de1ece86ac56 · 2015-10-16T11:54:53.000-07:00
yaml --- r: 6319 b: refs/heads/tswast-patch-1 c: 8e595a7 h: refs/heads/master i: 6317: bc5cdde 6315: 5b3f53b 6311: 0008d41 6303: 2358851
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 4e7aa3ad2949d127fe023604f640daabf9e86a1d
+refs/heads/tswast-patch-1: 8e595a7d5770967485ea04a6950cd91f9e0fa585
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/testing/LocalGcdHelper.java b/branches/tswast-patch-1/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) {`