---

aozarov · aozarov · commit 4dac0bb75db5 · 2016-03-07T15:28:21.000-08:00
yaml --- r: 3679 b: refs/heads/pubsub-alpha c: cded234 h: refs/heads/master i: 3677: 2f171d9 3675: 9d6b8a2 3671: 1243911 3663: cbd38f8 3647: 8807cba
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 36a62ef856d199f8efd09501b5ba65c422c01f23
 refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
 refs/heads/gh-pages: 7406918e071dd2c5677a638ae2a06e7592b6542c
-refs/heads/pubsub-alpha: d3224b38a07dbfd776b0818684bc21a5adcfeb64
+refs/heads/pubsub-alpha: cded23436465bb5fb1233eb5cd6740b4561357f9
 refs/heads/update-datastore: 47aae517c2cb33f1dccd909adaced73ec9d0f4df
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
 refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd
diff --git a/branches/pubsub-alpha/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java b/branches/pubsub-alpha/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
@@ -461,12 +461,20 @@ public Tuple<String, byte[]> read(StorageObject from, Map<Option, ?> options, lo
   public void write(String uploadId, byte[] toWrite, int toWriteOffset, long destOffset, int length,
       boolean last) {
     try {
+      if (length == 0 && !last) {
+        return;
+      }
       GenericUrl url = new GenericUrl(uploadId);
       HttpRequest httpRequest = storage.getRequestFactory().buildPutRequest(url,
           new ByteArrayContent(null, toWrite, toWriteOffset, length));
       long limit = destOffset + length;
       StringBuilder range = new StringBuilder("bytes ");
-      range.append(destOffset).append('-').append(limit - 1).append('/');
+      if (length == 0) {
+        range.append('*');
+      } else {
+        range.append(destOffset).append('-').append(limit - 1);
+      }
+      range.append('/');
       if (last) {
         range.append(limit);
       } else {
diff --git a/branches/pubsub-alpha/gcloud-java-storage/src/test/java/com/google/gcloud/storage/it/ITStorageTest.java b/branches/pubsub-alpha/gcloud-java-storage/src/test/java/com/google/gcloud/storage/it/ITStorageTest.java
@@ -823,6 +823,29 @@ public void testReadAndWriteChannels() throws IOException {
     assertTrue(storage.delete(BUCKET, blobName));
   }
 
+  @Test
+  public void testReadAndWriteChannelsWithDifferentFileSize() throws IOException {
+    String blobNamePrefix = "test-read-and-write-channels-blob-";
+    int[] blobSizes = {0, 700, 1024 * 256, 2 * 1024 * 1024, 4 * 1024 * 1024, 4 * 1024 * 1024 + 1};
+    Random rnd = new Random();
+    for (int blobSize : blobSizes) {
+      String blobName = blobNamePrefix + blobSize;
+      BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
+      byte[] bytes = new byte[blobSize];
+      rnd.nextBytes(bytes);
+      try (WriteChannel writer = storage.writer(blob)) {
+        writer.write(ByteBuffer.wrap(BLOB_BYTE_CONTENT));
+      }
+      ByteBuffer readBytes;
+      try (ReadChannel reader = storage.reader(blob.blobId())) {
+        readBytes = ByteBuffer.allocate(BLOB_BYTE_CONTENT.length);
+        reader.read(readBytes);
+      }
+      assertArrayEquals(BLOB_BYTE_CONTENT, readBytes.array());
+      assertTrue(storage.delete(BUCKET, blobName));
+    }
+  }
+
   @Test
   public void testReadAndWriteCaptureChannels() throws IOException {
     String blobName = "test-read-and-write-capture-channels-blob";
