Updated Branches: refs/heads/1.6.x 778f7993a -> 22097cf29
Map ResourceNotFoundException to ENOENT Project: http://git-wip-us.apache.org/repos/asf/jclouds-cli/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-cli/commit/22097cf2 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-cli/tree/22097cf2 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-cli/diff/22097cf2 Branch: refs/heads/1.6.x Commit: 22097cf292f424e3416bdfca41bd947ca23c22d7 Parents: 778f799 Author: Andrew Gaul <[email protected]> Authored: Fri Nov 22 14:03:33 2013 -0800 Committer: Andrew Gaul <[email protected]> Committed: Fri Nov 22 14:03:47 2013 -0800 ---------------------------------------------------------------------- runner/src/main/java/org/jclouds/cli/runner/Main.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-cli/blob/22097cf2/runner/src/main/java/org/jclouds/cli/runner/Main.java ---------------------------------------------------------------------- diff --git a/runner/src/main/java/org/jclouds/cli/runner/Main.java b/runner/src/main/java/org/jclouds/cli/runner/Main.java index 37764e9..e995bd6 100644 --- a/runner/src/main/java/org/jclouds/cli/runner/Main.java +++ b/runner/src/main/java/org/jclouds/cli/runner/Main.java @@ -56,6 +56,7 @@ import org.jclouds.blobstore.ContainerNotFoundException; import org.jclouds.blobstore.KeyNotFoundException; import org.jclouds.rest.AuthorizationException; import org.jclouds.rest.InsufficientResourcesException; +import org.jclouds.rest.ResourceNotFoundException; import org.jclouds.util.Throwables2; /** @@ -129,6 +130,8 @@ public class Main { exitIfThrowableMatches(t, IOException.class, Errno.EIO, "IO error"); exitIfThrowableMatches(t, InsufficientResourcesException.class, Errno.EDQUOT, "Insufficient resources"); exitIfThrowableMatches(t, KeyNotFoundException.class, Errno.ENOENT, "Blob not found"); + // ContainerNotFoundException and KeyNotFoundException must precede ResourceNotFoundException due to inheritance + exitIfThrowableMatches(t, ResourceNotFoundException.class, Errno.ENOENT, "Resource not found"); exitIfThrowableMatches(t, TimeoutException.class, Errno.ETIMEDOUT, "Timeout"); t.printStackTrace(); System.exit(Errno.UNKNOWN.getErrno());
