---

jean-philippe-martin · mziccard · commit f39925f3020e · 2016-06-30T09:13:05.000+02:00
yaml --- r: 7405 b: refs/heads/tswast-patch-1 c: f2aa350 h: refs/heads/master i: 7403: 92bb904
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: a176250251608b6e56bf7e2ee7b5e10c7eec3f0a
+refs/heads/tswast-patch-1: f2aa350398a73ce118533db5419127a37b3a3797
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-examples/src/main/java/com/google/cloud/examples/nio/CountBytes.java b/branches/tswast-patch-1/gcloud-java-examples/src/main/java/com/google/cloud/examples/nio/CountBytes.java
@@ -71,25 +71,26 @@ private static void countFile(String fname) {
       ByteBuffer buf = ByteBuffer.allocate(bufSize);
       System.out.println("Reading the whole file...");
       Stopwatch sw = Stopwatch.createStarted();
-      SeekableByteChannel chan = Files.newByteChannel(path);
-      long total = 0;
-      int readCalls = 0;
-      MessageDigest md = MessageDigest.getInstance("MD5");
-      while (chan.read(buf) > 0) {
-        readCalls++;
-        md.update(buf.array(), 0, buf.position());
-        total += buf.position();
-        buf.flip();
-      }
-      readCalls++; // We must count the last call
-      long elapsed = sw.elapsed(TimeUnit.SECONDS);
-      System.out.println("Read all " + total + " bytes in " + elapsed + "s. " +
-          "(" + readCalls +" calls to chan.read)");
-      String hex = String.valueOf(BaseEncoding.base16().encode(md.digest()));
-      System.out.println("The MD5 is: 0x" + hex);
-      if (total != size) {
-        System.out.println("Wait, this doesn't match! We saw " + total + " bytes, " +
-            "yet the file size is listed at " + size + " bytes.");
+      try (SeekableByteChannel chan = Files.newByteChannel(path)) {
+        long total = 0;
+        int readCalls = 0;
+        MessageDigest md = MessageDigest.getInstance("MD5");
+        while (chan.read(buf) > 0) {
+          readCalls++;
+          md.update(buf.array(), 0, buf.position());
+          total += buf.position();
+          buf.flip();
+        }
+        readCalls++; // We must count the last call
+        long elapsed = sw.elapsed(TimeUnit.SECONDS);
+        System.out.println("Read all " + total + " bytes in " + elapsed + "s. " +
+            "(" + readCalls +" calls to chan.read)");
+        String hex = String.valueOf(BaseEncoding.base16().encode(md.digest()));
+        System.out.println("The MD5 is: 0x" + hex);
+        if (total != size) {
+          System.out.println("Wait, this doesn't match! We saw " + total + " bytes, " +
+              "yet the file size is listed at " + size + " bytes.");
+        }
       }
     } catch (Exception ex) {
       System.out.println(fname + ": " + ex.toString());
diff --git a/branches/tswast-patch-1/gcloud-java-examples/src/main/java/com/google/cloud/examples/nio/ParallelCountBytes.java b/branches/tswast-patch-1/gcloud-java-examples/src/main/java/com/google/cloud/examples/nio/ParallelCountBytes.java
@@ -79,7 +79,7 @@ public WorkUnit call() throws IOException {
         return this;
       }
       chan.position(pos);
-      // read until buffer it is full, or EOF
+      // read until buffer is full, or EOF
       while (chan.read(buf) > 0) {};
       return this;
     }

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public WorkUnit call() throws IOException {`
`79`	`79`	`return this;`
`80`	`80`	`}`
`81`	`81`	`chan.position(pos);`
`82`		`- // read until buffer it is full, or EOF`
	`82`	`+ // read until buffer is full, or EOF`
`83`	`83`	`while (chan.read(buf) > 0) {};`
`84`	`84`	`return this;`
`85`	`85`	`}`