---

mziccard · mziccard · commit 6fb0b13583f7 · 2015-11-19T07:41:53.000+01:00
yaml --- r: 6539 b: refs/heads/tswast-patch-1 c: bfe8924 h: refs/heads/master i: 6537: 888060e 6535: beddf5a
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: 65373146e8cd827011631eb111ad4a5b52f5c2a5
+refs/heads/tswast-patch-1: bfe892428127615e2d75bcc51378c125e76ab637
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -1408,7 +1408,11 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
   /**
    * Return a channel for reading the blob's content. The blob's latest generation is read. If the
    * blob changes while reading (i.e. {@link BlobInfo#etag()} changes), subsequent calls to
-   * {@link BlobReadChannel#read(ByteBuffer)} may throw {@link StorageException}.
+   * {@code blobReadChannel.read(ByteBuffer)} may throw {@link StorageException}.
+   *
+   * <p>The {@link BlobSourceOption#generationMatch(long)} option can be provided to ensure that
+   * {@code blobReadChannel.read(ByteBuffer)} calls will throw {@link StorageException} if blob`s
+   * generation differs from the expected one.
    *
    * @throws StorageException upon failure
    */
@@ -1418,9 +1422,14 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
    * Return a channel for reading the blob's content. If {@code blob.generation()} is set
    * data corresponding to that generation is read. If {@code blob.generation()} is {@code null}
    * the blob's latest generation is read. If the blob changes while reading (i.e.
-   * {@link BlobInfo#etag()} changes), subsequent calls to {@link BlobReadChannel#read(ByteBuffer)}
+   * {@link BlobInfo#etag()} changes), subsequent calls to {@code blobReadChannel.read(ByteBuffer)}
    * may throw {@link StorageException}.
    *
+   * <p>The {@link BlobSourceOption#generationMatch()} and
+   * {@link BlobSourceOption#generationMatch(long)} options can be used to ensure that
+   * {@code blobReadChannel.read(ByteBuffer)} calls will throw {@link StorageException} if the
+   * blob`s generation differs from the expected one.
+   *
    * @throws StorageException upon failure
    */
   BlobReadChannel reader(BlobId blob, BlobSourceOption... options);
diff --git a/branches/tswast-patch-1/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java b/branches/tswast-patch-1/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java
@@ -188,7 +188,6 @@ public void testReadGenerationChanged() throws IOException {
       StringBuilder messageBuilder = new StringBuilder();
       messageBuilder.append("Blob ").append(blobId).append(" was updated while reading");
       assertEquals(messageBuilder.toString(), ex.getMessage());
-      // expected
     }
   }
 
diff --git a/branches/tswast-patch-1/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/branches/tswast-patch-1/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -759,7 +759,9 @@ public void testReadChannelFailUpdatedGeneration() throws IOException {
       reader.read(readBytes);
       fail("StorageException was expected");
     } catch(StorageException ex) {
-      // expected
+      StringBuilder messageBuilder = new StringBuilder();
+      messageBuilder.append("Blob ").append(blob.blobId()).append(" was updated while reading");
+      assertEquals(messageBuilder.toString(), ex.getMessage());
     }
     assertTrue(storage.delete(BUCKET, blobName));
   }

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,6 @@ public void testReadGenerationChanged() throws IOException {`
`188`	`188`	`StringBuilder messageBuilder = new StringBuilder();`
`189`	`189`	`messageBuilder.append("Blob ").append(blobId).append(" was updated while reading");`
`190`	`190`	`assertEquals(messageBuilder.toString(), ex.getMessage());`
`191`		`- // expected`
`192`	`191`	`}`
`193`	`192`	`}`
`194`	`193`
Original file line number	Diff line number	Diff line change
`@@ -759,7 +759,9 @@ public void testReadChannelFailUpdatedGeneration() throws IOException {`
`759`	`759`	`reader.read(readBytes);`
`760`	`760`	`fail("StorageException was expected");`
`761`	`761`	`} catch(StorageException ex) {`
`762`		`- // expected`
	`762`	`+ StringBuilder messageBuilder = new StringBuilder();`
	`763`	`+ messageBuilder.append("Blob ").append(blob.blobId()).append(" was updated while reading");`
	`764`	`+ assertEquals(messageBuilder.toString(), ex.getMessage());`
`763`	`765`	`}`
`764`	`766`	`assertTrue(storage.delete(BUCKET, blobName));`
`765`	`767`	`}`