Repository: jclouds Updated Branches: refs/heads/master c22afc5a5 -> f19853c27
Revert "metadata and content metadata should have the same length" This reverts commit bbafc34d462f32d0d2a617e30b78d961b9661135. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/f19853c2 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/f19853c2 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/f19853c2 Branch: refs/heads/master Commit: f19853c278b1db1fa055dfcd24d0ef0d3beb20db Parents: c22afc5 Author: Andrew Gaul <[email protected]> Authored: Wed May 27 22:19:15 2015 -0700 Committer: Andrew Gaul <[email protected]> Committed: Wed May 27 22:19:15 2015 -0700 ---------------------------------------------------------------------- .../main/java/org/jclouds/blobstore/config/LocalBlobStore.java | 4 +--- .../integration/internal/BaseBlobStoreIntegrationTest.java | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/f19853c2/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 be96b73..36be5a0 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java @@ -658,9 +658,7 @@ public final class LocalBlobStore implements BlobStore { byte[] byteArray = out.toByteArray(); blob.setPayload(byteArray); HttpUtils.copy(cmd, blob.getPayload().getContentMetadata()); - Long size = Long.valueOf(byteArray.length); - blob.getPayload().getContentMetadata().setContentLength(size); - blob.getMetadata().setSize(size); + blob.getPayload().getContentMetadata().setContentLength(Long.valueOf(byteArray.length)); } } checkNotNull(blob.getPayload(), "payload " + blob); http://git-wip-us.apache.org/repos/asf/jclouds/blob/f19853c2/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 917fb75..89776d6 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,7 +284,6 @@ 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; }
