commit 2541fd39893e853fadaa43579fa731de459f6390
author Andrew Gaul <gaul@apache.org> Fri Nov 22 14:03:33 2013 -0800
committer Andrew Gaul <gaul@apache.org> Fri Nov 22 14:09:40 2013 -0800
tree ec71d1ec2dc97f1732a2471801bede0fd8ab5d30
parent 8a43a4dbcb263cc83dae7bab33e8bce7afd3e2fc

Map ResourceNotFoundException to ENOENT

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.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 @@
             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());