Repository: jclouds Updated Branches: refs/heads/master 0fb1b459a -> 4abd5dd16
Revert "Delete parts when removing Swift multipart objects" This reverts commit 3c1588527dfc0682faf696186ebc18d29f7ee0da. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/4abd5dd1 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/4abd5dd1 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/4abd5dd1 Branch: refs/heads/master Commit: 4abd5dd16f72b8233b914ace18dee02d1a9e57dc Parents: 0fb1b45 Author: Andrew Gaul <[email protected]> Authored: Tue Dec 8 10:08:22 2015 +0800 Committer: Andrew Gaul <[email protected]> Committed: Tue Dec 8 10:08:22 2015 +0800 ---------------------------------------------------------------------- .../openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java | 3 +-- .../blobstore/integration/internal/BaseBlobIntegrationTest.java | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/4abd5dd1/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java ---------------------------------------------------------------------- diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java index ac326ff..692401c 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java @@ -344,8 +344,7 @@ public class RegionScopedSwiftBlobStore implements BlobStore { @Override public void removeBlob(String container, String name) { - // use SLO API to delete blob regardless of whether its a single- or multi-part object - api.getStaticLargeObjectApi(regionId, container).delete(name); + api.getObjectApi(regionId, container).delete(name); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/4abd5dd1/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java ---------------------------------------------------------------------- diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java index 75eb17a..cdcdec6 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java @@ -943,10 +943,6 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest { assertThat(ByteStreams2.toByteArrayAndClose(newBlob.getPayload().openStream())).isEqualTo(byteSource.read()); checkContentMetadata(newBlob); checkUserMetadata(newBlob.getMetadata().getUserMetadata(), blob.getMetadata().getUserMetadata()); - - // ensure that deleting multi-part manifest deletes any user-visible parts - blobStore.removeBlob(container, name); - assertThat(blobStore.list(container)).isEmpty(); } finally { returnContainer(container); }
