Updated Branches: refs/heads/1.6.x faecd45a0 -> 2addcbf9d
Handle multiple of MAX_BLOCK_SIZE for Azure MPU Currently files are not properly uploaded if they are a multiple of MAX_BLOCK_SIZE. Fixes JCLOUDS-233. Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/8dfb8940 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/8dfb8940 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/8dfb8940 Branch: refs/heads/1.6.x Commit: 8dfb894007de5703a06bf00dbf3c6c5ffaf2ce0e Parents: faecd45 Author: Tom Manville <[email protected]> Authored: Mon Aug 5 20:50:42 2013 -0700 Committer: Andrew Gaul <[email protected]> Committed: Tue Aug 6 11:55:25 2013 -0700 ---------------------------------------------------------------------- .../azureblob/blobstore/strategy/AzureBlobBlockUploadStrategy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/8dfb8940/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/strategy/AzureBlobBlockUploadStrategy.java ---------------------------------------------------------------------- diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/strategy/AzureBlobBlockUploadStrategy.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/strategy/AzureBlobBlockUploadStrategy.java index dc4cb5d..03b57ae 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/strategy/AzureBlobBlockUploadStrategy.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/strategy/AzureBlobBlockUploadStrategy.java @@ -70,7 +70,7 @@ public class AzureBlobBlockUploadStrategy implements MultipartUploadStrategy { while (offset < length) { blockCount++; long chunkSize = MAX_BLOCK_SIZE; - if (blockCount >= totalBlocks) { + if (length - offset < MAX_BLOCK_SIZE) { chunkSize = length % MAX_BLOCK_SIZE; } bytesWritten += chunkSize;
