Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Delete parts when removing Swift multipart objects" 

This reverts commit 3c1588527d.
This commit is contained in:
Andrew Gaul 2015-12-08 10:08:22 +08:00
parent 0fb1b459a6
commit 4abd5dd16f
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java
View File

@ -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

4
blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
View File

@ -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);
}