Repository: jclouds Updated Branches: refs/heads/master 5095590d6 -> bbafc34d4
metadata and content metadata should have the same length for range get in a LocalBlobStore, metadata.getSize() has the original blob size and contentMetadata.getContentLength() has the actual payload size. Other blobstores have the same size in both Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/bbafc34d Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/bbafc34d Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/bbafc34d Branch: refs/heads/master Commit: bbafc34d462f32d0d2a617e30b78d961b9661135 Parents: 5095590 Author: Ka-Hing Cheung <[email protected]> Authored: Tue May 26 16:07:24 2015 -0700 Committer: Ka-Hing Cheung <[email protected]> Committed: Tue May 26 16:45:34 2015 -0700 ---------------------------------------------------------------------- .../main/java/org/jclouds/blobstore/config/LocalBlobStore.java | 4 +++- .../integration/internal/BaseBlobStoreIntegrationTest.java | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/bbafc34d/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java ---------------------------------------------------------------------- diff --git a/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java b/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java index ea82edf..95364e8 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java @@ -655,7 +655,9 @@ public final class LocalBlobStore implements BlobStore { byte[] byteArray = out.toByteArray(); blob.setPayload(byteArray); HttpUtils.copy(cmd, blob.getPayload().getContentMetadata()); - blob.getPayload().getContentMetadata().setContentLength(Long.valueOf(byteArray.length)); + Long size = Long.valueOf(byteArray.length); + blob.getPayload().getContentMetadata().setContentLength(size); + blob.getMetadata().setSize(size); } } checkNotNull(blob.getPayload(), "payload " + blob); http://git-wip-us.apache.org/repos/asf/jclouds/blob/bbafc34d/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java ---------------------------------------------------------------------- diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java index 89776d6..917fb75 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java @@ -284,6 +284,7 @@ public class BaseBlobStoreIntegrationTest extends BaseViewLiveTest<BlobStoreCont protected <T extends BlobMetadata> T validateMetadata(T md, String container, String name) { assertEquals(md.getName(), name); assertEquals(md.getContainer(), container); + assertEquals(md.getSize(), md.getContentMetadata().getContentLength()); return md; }
