---

Ajay Kannan · Ajay Kannan · commit 8469dae3ad9b · 2015-10-16T14:21:39.000-07:00
yaml --- r: 6321 b: refs/heads/tswast-patch-1 c: 054ed10 h: refs/heads/master i: 6319: de1ece8
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: 5029f0049958b844fc40fda1b8e627fa4449e04f
+refs/heads/tswast-patch-1: 054ed10544c409f26258fbae3fde57b3f96141cc
 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
@@ -16,6 +16,7 @@
 
 package com.google.gcloud.datastore.testing;
 
+import static com.google.common.base.MoreObjects.firstNonNull;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.base.Strings;
@@ -259,6 +260,7 @@ public void run() {
           // ignore
         }
       }
+      processLogLine(previousLine, firstNonNull(nextLine, ""));
       writeLog(currentLogLevel, currentLog);
     }
 
@@ -279,15 +281,17 @@ private void processLogLine(String previousLine, String nextLine) {
         } else {
           collectionMode = true;
         }
-      } else if (collectionMode && currentLog.length() > LOG_LENGTH_LIMIT) {
-        collectionMode = false;
       } else if (collectionMode) {
-        if (currentLog.length() == 0) {
+        if (currentLog.length() > LOG_LENGTH_LIMIT) {
+          collectionMode = false;
+        } else if (currentLog.length() == 0) {
           // strip level out of the line
-          currentLog.append(
-              "GCD" + previousLine.split(":", 2)[1] + System.getProperty("line.separator"));
+          currentLog.append("GCD");
+          currentLog.append(previousLine.split(":", 2)[1]);
+          currentLog.append(System.getProperty("line.separator"));
         } else {
-          currentLog.append(previousLine + System.getProperty("line.separator"));
+          currentLog.append(previousLine);
+          currentLog.append(System.getProperty("line.separator"));
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`
`17`	`17`	`package com.google.gcloud.datastore.testing;`
`18`	`18`
	`19`	`+import static com.google.common.base.MoreObjects.firstNonNull;`
`19`	`20`	`import static java.nio.charset.StandardCharsets.UTF_8;`
`20`	`21`
`21`	`22`	`import com.google.common.base.Strings;`
`@@ -259,6 +260,7 @@ public void run() {`
`259`	`260`	`// ignore`
`260`	`261`	`}`
`261`	`262`	`}`
	`263`	`+ processLogLine(previousLine, firstNonNull(nextLine, ""));`
`262`	`264`	`writeLog(currentLogLevel, currentLog);`
`263`	`265`	`}`
`264`	`266`
`@@ -279,15 +281,17 @@ private void processLogLine(String previousLine, String nextLine) {`
`279`	`281`	`} else {`
`280`	`282`	`collectionMode = true;`
`281`	`283`	`}`
`282`		`- } else if (collectionMode && currentLog.length() > LOG_LENGTH_LIMIT) {`
`283`		`- collectionMode = false;`
`284`	`284`	`} else if (collectionMode) {`
`285`		`- if (currentLog.length() == 0) {`
	`285`	`+ if (currentLog.length() > LOG_LENGTH_LIMIT) {`
	`286`	`+ collectionMode = false;`
	`287`	`+ } else if (currentLog.length() == 0) {`
`286`	`288`	`// strip level out of the line`
`287`		`- currentLog.append(`
`288`		`- "GCD" + previousLine.split(":", 2)[1] + System.getProperty("line.separator"));`
	`289`	`+ currentLog.append("GCD");`
	`290`	`+ currentLog.append(previousLine.split(":", 2)[1]);`
	`291`	`+ currentLog.append(System.getProperty("line.separator"));`
`289`	`292`	`} else {`
`290`		`- currentLog.append(previousLine + System.getProperty("line.separator"));`
	`293`	`+ currentLog.append(previousLine);`
	`294`	`+ currentLog.append(System.getProperty("line.separator"));`
`291`	`295`	`}`
`292`	`296`	`}`
`293`	`297`	`}`