You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2013/11/22 23:09:54 UTC
git commit: Map ResourceNotFoundException to ENOENT
Updated Branches:
refs/heads/master 8a43a4dbc -> 2541fd398
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/2541fd39
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-cli/tree/2541fd39
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-cli/diff/2541fd39
Branch: refs/heads/master
Commit: 2541fd39893e853fadaa43579fa731de459f6390
Parents: 8a43a4d
Author: Andrew Gaul <ga...@apache.org>
Authored: Fri Nov 22 14:03:33 2013 -0800
Committer: Andrew Gaul <ga...@apache.org>
Committed: Fri Nov 22 14:09:40 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/2541fd39/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());