---

mziccard · mziccard · commit f4e67a74c05b · 2015-10-19T22:35:16.000+02:00
yaml --- r: 6331 b: refs/heads/tswast-patch-1 c: 638bd92 h: refs/heads/master i: 6329: 145048b 6327: ba182e4
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: 2060526a1469fbbf6a492594ac3dc66d06aaa51c
+refs/heads/tswast-patch-1: 638bd92113a30b4e1b330f941db1b02fda41039f
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannelImpl.java b/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannelImpl.java
@@ -227,9 +227,11 @@ static Builder builder(StorageOptions options, BlobInfo blobInfo, String uploadI
     @Override
     public BlobWriteChannel restore() {
       BlobWriteChannelImpl channel = new BlobWriteChannelImpl(serviceOptions, blobInfo, uploadId);
+      if (buffer != null) {
+        channel.buffer = buffer.clone();
+        channel.limit = buffer.length;
+      }
       channel.position = position;
-      channel.buffer = buffer.clone();
-      channel.limit = buffer.length;
       channel.isOpen = isOpen;
       channel.chunkSize = chunkSize;
       return channel;
diff --git a/branches/tswast-patch-1/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java b/branches/tswast-patch-1/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java
@@ -220,6 +220,32 @@ public void testSaveAndRestore() throws IOException {
     assertEquals(new Long(DEFAULT_CHUNK_SIZE), capturedPosition.getValues().get(1));
   }
 
+  @Test
+  public void testSaveAndRestoreClosed() throws IOException {
+    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock).times(2);
+    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
+    EasyMock.replay(optionsMock);
+    EasyMock.expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
+    Capture<byte[]> capturedBuffer = Capture.newInstance();
+    storageRpcMock.write(EasyMock.eq(UPLOAD_ID), EasyMock.capture(capturedBuffer), EasyMock.eq(0),
+        EasyMock.eq(BLOB_INFO.toPb()), EasyMock.eq(0L), EasyMock.eq(0), EasyMock.eq(true));
+    EasyMock.expectLastCall();
+    EasyMock.replay(storageRpcMock);
+    writer = new BlobWriteChannelImpl(optionsMock, BLOB_INFO, EMPTY_RPC_OPTIONS);
+    writer.close();
+    RestorableState<BlobWriteChannel> writerState = writer.save();
+    RestorableState<BlobWriteChannel> expectedWriterState =
+        BlobWriteChannelImpl.StateImpl.builder(optionsMock, BLOB_INFO, UPLOAD_ID)
+            .buffer(null)
+            .chunkSize(DEFAULT_CHUNK_SIZE)
+            .isOpen(false)
+            .position(0)
+            .build();
+    BlobWriteChannel restoredWriter = writerState.restore();
+    assertArrayEquals(new byte[0], capturedBuffer.getValue());
+    assertEquals(expectedWriterState, restoredWriter.save());
+  }
+
   @Test
   public void testStateEquals() {
     EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock).times(2);
