---

Ajay Kannan · Ajay Kannan · commit 0a77604fe7da · 2015-10-16T13:32:08.000-07:00
yaml --- r: 1049 b: refs/heads/master c: 5029f00 h: refs/heads/master i: 1047: bac1f3b v: v3
diff --git a/[refs] b/[refs]
@@ -1,4 +1,4 @@
 ---
-refs/heads/master: 8e595a7d5770967485ea04a6950cd91f9e0fa585
+refs/heads/master: 5029f0049958b844fc40fda1b8e627fa4449e04f
 refs/heads/travis: 0fa997e2fc9c6b61b2d91e6d163655aae67d44b6
 refs/heads/gh-pages: 5a10432ecc75f29812e33a8236c900379509fe99
diff --git a/trunk/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/testing/LocalGcdHelper.java b/trunk/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/testing/LocalGcdHelper.java
@@ -180,7 +180,7 @@ private static Path executablePath(String cmd) {
 
   private static class ProcessStreamReader extends Thread {
     private final BufferedReader reader;
-    private volatile boolean terminated = false;
+    private volatile boolean terminated;
 
     ProcessStreamReader(InputStream inputStream) {
       super("Local GCD InputStream reader");
@@ -220,10 +220,10 @@ private static class ProcessErrorStreamReader extends Thread {
         "com.google.apphosting.client.serviceapp.BaseApiServlet";
 
     private final BufferedReader errorReader;
-    private String currentLog = null;
-    private Level currentLogLevel = null;
-    private boolean collectionMode = false;
-    private volatile boolean terminated = false;
+    private StringBuilder currentLog;
+    private Level currentLogLevel;
+    private boolean collectionMode;
+    private volatile boolean terminated;
 
     ProcessErrorStreamReader(InputStream errorStream, String blockUntil) throws IOException {
       super("Local GCD ErrorStream reader");
@@ -268,11 +268,13 @@ private void processLogLine(String previousLine, String nextLine) {
       //     [LEVEL]: error message
       // Exceptions and stack traces are included in gcd error stream, separated by a newline
       Level nextLogLevel = getLevel(nextLine);
-      if (previousLine.contains(GCD_LOGGING_CLASS) && nextLogLevel != null) {
+      if (nextLogLevel != null) {
         writeLog(currentLogLevel, currentLog);
-        currentLog = "";
+        currentLog = new StringBuilder();
         currentLogLevel = nextLogLevel;
-        if (nextLine.startsWith("SEVERE: ")) {
+        if (!previousLine.contains(GCD_LOGGING_CLASS)) {
+          collectionMode = false;
+        } else if (nextLine.startsWith("SEVERE: ")) {
           collectionMode = false; // don't show duplicate messages (see issue #258)
         } else {
           collectionMode = true;
@@ -282,16 +284,17 @@ private void processLogLine(String previousLine, String nextLine) {
       } else if (collectionMode) {
         if (currentLog.length() == 0) {
           // strip level out of the line
-          currentLog = "GCD" + previousLine.split(":", 2)[1] + System.getProperty("line.separator");
+          currentLog.append(
+              "GCD" + previousLine.split(":", 2)[1] + System.getProperty("line.separator"));
         } else {
-          currentLog += previousLine + System.getProperty("line.separator");
+          currentLog.append(previousLine + System.getProperty("line.separator"));
         }
       }
     }
 
-    private static void writeLog(Level level, String msg) {
-      if (level != null && !Strings.isNullOrEmpty(msg)) {
-        log.log(level, msg.trim());
+    private static void writeLog(Level level, StringBuilder msg) {
+      if (level != null && msg != null && msg.length() != 0) {
+        log.log(level, msg.toString().trim());
       }
     }
 
