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

Avoid Futures.getUnchecked in DeleteAllKeysInList 

This masks InterruptedException.  We should rework the logic in
execute to unwind the stack on errors; currently we only return from
the leaf method.
This commit is contained in:
Andrew Gaul 2012-09-19 15:54:31 -07:00 committed by Andrew Gaul
parent b68001e085
commit a70ba3f986
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/DeleteAllKeysInList.java
View File

@ -22,6 +22,7 @@ import static org.jclouds.blobstore.options.ListContainerOptions.Builder.recursi
import static org.jclouds.concurrent.FutureIterables.awaitCompletion;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
@ -95,8 +96,11 @@ public class DeleteAllKeysInList implements ClearListStrategy, ClearContainerStr
for (int i = 0; i < maxErrors; ) {
// fetch partial directory listing
try {
listing = Futures.getUnchecked(connection.list(containerName, options));
} catch (RuntimeException ee) {
listing = connection.list(containerName, options).get();
} catch (InterruptedException ie) {
Thread.currentThread().interrupt();
break;
} catch (ExecutionException ee) {
++i;
if (i == maxErrors) {
throw Throwables.propagate(ee.getCause());