Repository: jclouds-labs-aws Updated Branches: refs/heads/master f0e3375a6 -> 1c45642d6
JCLOUDS-40 unasync Fallback. Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/commit/1c45642d Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/tree/1c45642d Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/diff/1c45642d Branch: refs/heads/master Commit: 1c45642d6106949c957e89feb9d0c7ce4955b659 Parents: f0e3375 Author: Adrian Cole <[email protected]> Authored: Mon Oct 6 13:42:44 2014 -0700 Committer: Adrian Cole <[email protected]> Committed: Mon Oct 6 16:06:21 2014 -0700 ---------------------------------------------------------------------- .../fallbacks/FalseOnIllegalArgumentException.java | 10 ---------- rds/src/main/java/org/jclouds/rds/RDSFallbacks.java | 8 -------- 2 files changed, 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/1c45642d/glacier/src/main/java/org/jclouds/glacier/fallbacks/FalseOnIllegalArgumentException.java ---------------------------------------------------------------------- diff --git a/glacier/src/main/java/org/jclouds/glacier/fallbacks/FalseOnIllegalArgumentException.java b/glacier/src/main/java/org/jclouds/glacier/fallbacks/FalseOnIllegalArgumentException.java index 08839a2..3cb79f9 100644 --- a/glacier/src/main/java/org/jclouds/glacier/fallbacks/FalseOnIllegalArgumentException.java +++ b/glacier/src/main/java/org/jclouds/glacier/fallbacks/FalseOnIllegalArgumentException.java @@ -18,28 +18,18 @@ package org.jclouds.glacier.fallbacks; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Throwables.propagate; -import static com.google.common.util.concurrent.Futures.immediateFuture; import static org.jclouds.util.Throwables2.getFirstThrowableOfType; import org.jclouds.Fallback; -import com.google.common.util.concurrent.ListenableFuture; - /** * Returns false when encountering an IllegalArgumentException. */ public class FalseOnIllegalArgumentException implements Fallback<Boolean> { - - @Override - public ListenableFuture<Boolean> create(Throwable t) throws Exception { - return immediateFuture(createOrPropagate(t)); - } - @Override public Boolean createOrPropagate(Throwable t) throws Exception { if (getFirstThrowableOfType(checkNotNull(t, "throwable"), IllegalArgumentException.class) != null) return false; throw propagate(t); } - } http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/1c45642d/rds/src/main/java/org/jclouds/rds/RDSFallbacks.java ---------------------------------------------------------------------- diff --git a/rds/src/main/java/org/jclouds/rds/RDSFallbacks.java b/rds/src/main/java/org/jclouds/rds/RDSFallbacks.java index afe18e1..637d480 100644 --- a/rds/src/main/java/org/jclouds/rds/RDSFallbacks.java +++ b/rds/src/main/java/org/jclouds/rds/RDSFallbacks.java @@ -17,25 +17,17 @@ package org.jclouds.rds; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.util.concurrent.Futures.immediateFuture; import static org.jclouds.Fallbacks.valOnNotFoundOr404; import org.jclouds.Fallback; import org.jclouds.aws.AWSResponseException; -import com.google.common.util.concurrent.ListenableFuture; - public final class RDSFallbacks { private RDSFallbacks() { } public static final class NullOnStateDeletingNotFoundOr404 implements Fallback<Object> { @Override - public ListenableFuture<Object> create(Throwable t) throws Exception { - return immediateFuture(createOrPropagate(t)); - } - - @Override public Object createOrPropagate(Throwable t) throws Exception { if (checkNotNull(t, "throwable") instanceof AWSResponseException) { AWSResponseException e = AWSResponseException.class.cast(t);
