---

Ajay Kannan · Ajay Kannan · commit bac1f3b5a3d5 · 2015-10-16T11:44:12.000-07:00
yaml --- r: 1047 b: refs/heads/master c: 4e7aa3a h: refs/heads/master i: 1045: 79098d0 1043: cd4a639 1039: f892325 v: v3
diff --git a/[refs] b/[refs]
@@ -1,4 +1,4 @@
 ---
-refs/heads/master: 007a9ab7964ff49bd2bc52ab66119b52477095b4
+refs/heads/master: 4e7aa3ad2949d127fe023604f640daabf9e86a1d
 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
@@ -179,8 +179,8 @@ private static Path executablePath(String cmd) {
   }
 
   private static class ProcessStreamReader extends Thread {
-    private volatile BufferedReader reader;
-    private boolean terminated = false;
+    private final BufferedReader reader;
+    private volatile boolean terminated = false;
 
     ProcessStreamReader(InputStream inputStream) {
       super("Local GCD InputStream reader");
@@ -195,15 +195,15 @@ void terminate() throws IOException {
 
     @Override
     public void run() {
-      try {
-        while (!terminated) {
+      while (!terminated) {
+        try {
           String line = reader.readLine();
           if (line == null) {
             terminated = true;
           }
+        } catch (IOException e) {
+          // ignore
         }
-      } catch (IOException e) {
-        // ignore
       }
     }
 
@@ -219,11 +219,11 @@ private static class ProcessErrorStreamReader extends Thread {
     private static final String GCD_LOGGING_CLASS =
         "com.google.apphosting.client.serviceapp.BaseApiServlet";
 
-    private volatile BufferedReader errorReader;
+    private final BufferedReader errorReader;
     private String currentLog = null;
     private Level currentLogLevel = null;
     private boolean collectionMode = false;
-    private boolean terminated = false;
+    private volatile boolean terminated = false;
 
     ProcessErrorStreamReader(InputStream errorStream, String blockUntil) throws IOException {
       super("Local GCD ErrorStream reader");
@@ -245,10 +245,10 @@ void terminate() throws IOException {
 
     @Override
     public void run() {
-      try {
-        String previousLine = "";
-        String nextLine = "";
-        while (!terminated) {
+      String previousLine = "";
+      String nextLine = "";
+      while (!terminated) {
+        try {
           previousLine = nextLine;
           nextLine = errorReader.readLine();
           if (nextLine == null) {
@@ -257,9 +257,9 @@ public void run() {
           } else {
             processLogLine(previousLine, nextLine);
           }
+        } catch (IOException e) {
+          // ignore
         }
-      } catch (IOException e) {
-        // ignore
       }
     }
 
