---

mziccard · mziccard · commit 145048bc5763 · 2015-10-19T12:52:33.000+02:00
yaml --- r: 6329 b: refs/heads/tswast-patch-1 c: 71604bb h: refs/heads/master i: 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: dcbe37fab40c070d58155fdaa8b8fee673a40582
+refs/heads/tswast-patch-1: 71604bba52031a8609b682903ada37943f158b1b
 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
@@ -73,18 +73,17 @@ class BlobWriteChannelImpl implements BlobWriteChannel {
   @Override
   public RestorableState<BlobWriteChannel> save() {
     if (isOpen) {
-      flush(true);
+      flush();
     }
     return StateImpl.builder(options, blobInfo, uploadId)
         .position(position)
-        .buffer(buffer)
-        .limit(limit)
+        .buffer(Arrays.copyOf(buffer, limit))
         .isOpen(isOpen)
         .chunkSize(chunkSize).build();
   }
 
-  private void flush(boolean compact) {
-    if (limit >= chunkSize || compact && limit >= MIN_CHUNK_SIZE) {
+  private void flush() {
+    if (limit >= chunkSize) {
       final int length = limit - limit % MIN_CHUNK_SIZE;
       try {
         runWithRetries(callable(new Runnable() {
@@ -98,7 +97,7 @@ public void run() {
       }
       position += length;
       limit -= length;
-      byte[] temp = new byte[compact ? limit : chunkSize];
+      byte[] temp = new byte[chunkSize];
       System.arraycopy(buffer, length, temp, 0, limit);
       buffer = temp;
     }
@@ -122,7 +121,7 @@ public int write(ByteBuffer byteBuffer) throws IOException {
       byteBuffer.get(buffer, limit, toWrite);
     }
     limit += toWrite;
-    flush(false);
+    flush();
     return toWrite;
   }
 
@@ -175,7 +174,7 @@ static class StateImpl implements RestorableState<BlobWriteChannel>, Serializabl
       this.uploadId = builder.uploadId;
       this.position = builder.position;
       this.buffer = builder.buffer;
-      this.limit = builder.limit;
+      this.limit = this.buffer.length;
       this.isOpen = builder.isOpen;
       this.chunkSize = builder.chunkSize;
     }
@@ -202,12 +201,7 @@ Builder position(int position) {
       }
 
       Builder buffer(byte[] buffer) {
-        this.buffer = buffer.clone();
-        return this;
-      }
-
-      Builder limit(int limit) {
-        this.limit = limit;
+        this.buffer = buffer;
         return this;
       }
 
