From 0053c77b9bab152382b197b5017b11748f8df34e Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Wed, 23 Jan 2013 22:24:39 -0800 Subject: [PATCH] Call BlobUtils.clearContainer directly BaseAsyncBlobStore.clearContainer returns a Future which we previously did not manage correctly, hanging when deleting non-existent containers. Call BlobUtils.clearContainer directly to address this. --- .../java/org/jclouds/blobstore/internal/BaseAsyncBlobStore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blobstore/src/main/java/org/jclouds/blobstore/internal/BaseAsyncBlobStore.java b/blobstore/src/main/java/org/jclouds/blobstore/internal/BaseAsyncBlobStore.java index ef1b3f455b..b292b46dc8 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/internal/BaseAsyncBlobStore.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/internal/BaseAsyncBlobStore.java @@ -271,7 +271,7 @@ public abstract class BaseAsyncBlobStore implements AsyncBlobStore { if (!Assertions.eventuallyTrue(new Supplier() { public Boolean get() { try { - clearContainer(container, recursive()); + blobUtils.clearContainer(container, recursive()); return deleteAndVerifyContainerGone(container); } catch (ContainerNotFoundException e) { return true;