HeidCloud
diff --git a/‎openstack-client-connectors/jersey2-connector/src/main/java/org/openstack/connector/JaxRs20Connector.java‎
Lines changed: 13 additions & 5 deletions b/‎openstack-client-connectors/jersey2-connector/src/main/java/org/openstack/connector/JaxRs20Connector.java‎
Lines changed: 13 additions & 5 deletions
diff --git a/‎openstack-client-connectors/resteasy-connector/src/main/java/org/openstack/connector/RESTEasyConnector.java‎
Lines changed: 21 additions & 2 deletions b/‎openstack-client-connectors/resteasy-connector/src/main/java/org/openstack/connector/RESTEasyConnector.java‎
Lines changed: 21 additions & 2 deletions
diff --git a/‎openstack-client/src/main/java/org/openstack/base/client/OpenStackNotAuthorized.java‎
Lines changed: 7 additions & 0 deletions b/‎openstack-client/src/main/java/org/openstack/base/client/OpenStackNotAuthorized.java‎
Lines changed: 7 additions & 0 deletions
@@ -4,6 +4,7 @@
 import java.util.Map;
 import java.util.logging.Logger;
 
+import javax.ws.rs.NotAuthorizedException;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.Invocation;
@@ -12,6 +13,7 @@
 
 import org.glassfish.jersey.filter.LoggingFilter;
 import org.openstack.base.client.OpenStackClientConnector;
+import org.openstack.base.client.OpenStackNotAuthorized;
 import org.openstack.base.client.OpenStackRequest;
 
 import com.google.common.reflect.TypeToken;
@@ -32,12 +34,18 @@ public <T> T execute(OpenStackRequest request, Class<T> responseType) {
 			}
 			invocation.header(h.getKey(), sb);
 		}
-		if(request.entity() != null) {
-			return invocation.method(request.method().name(), Entity.entity(request.entity().getEntity(),request.entity().getContentType()), responseType);
-		} else {
-			return invocation.method(request.method().name(), responseType);
-		}
 
+		try {
+			if (request.entity() != null) {
+				return invocation.method(request.method().name(), Entity
+						.entity(request.entity().getEntity(), request.entity()
+								.getContentType()), responseType);
+			} else {
+				return invocation.method(request.method().name(), responseType);
+			}
+		} catch (NotAuthorizedException e) {
+			throw new OpenStackNotAuthorized();
+		}
 	}
 
 	@Override
 
@@ -6,6 +6,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ContextResolver;
 
+import org.apache.commons.httpclient.HttpStatus;
 import org.codehaus.jackson.jaxrs.JacksonJsonProvider;
 import org.codehaus.jackson.map.DeserializationConfig;
 import org.codehaus.jackson.map.ObjectMapper;
@@ -14,8 +15,10 @@
 import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
 import org.jboss.resteasy.client.ClientRequest;
 import org.jboss.resteasy.client.ClientRequestFactory;
+import org.jboss.resteasy.client.ClientResponse;
 import org.jboss.resteasy.spi.ResteasyProviderFactory;
 import org.openstack.base.client.OpenStackClientConnector;
+import org.openstack.base.client.OpenStackNotAuthorized;
 import org.openstack.base.client.OpenStackRequest;
 
 import com.google.common.reflect.TypeToken;
@@ -73,11 +76,27 @@ public <T> T execute(OpenStackRequest request, Class<T> responseType) {
 			client.body(request.entity().getContentType(), request.entity().getEntity());
 		}
 
+		ClientResponse<T> response;
+
 		try {
-			return (T) client.httpMethod(request.method().name(), responseType).getEntity(responseType);
+			response = client.httpMethod(request.method().name(), responseType);
 		} catch (Exception e) {
-			return null;
+			throw new RuntimeException("Unexpected client exception", e);
+		}
+
+		if (response.getStatus() == HttpStatus.SC_OK
+		                || response.getStatus() == HttpStatus.SC_NO_CONTENT) {
+		        return (T) response.getEntity(responseType);
 		}
+
+		response.releaseConnection();
+
+		if (response.getStatus() == HttpStatus.SC_UNAUTHORIZED) {
+			throw new OpenStackNotAuthorized();
+		}
+
+		throw new RuntimeException("Unexpected response status code "
+				+ response.getStatus());
 	}
 
 	@Override
 
@@ -0,0 +1,7 @@
+package org.openstack.base.client;
+
+public class OpenStackNotAuthorized extends RuntimeException {
+
+	private static final long serialVersionUID = -9217419406046755047L;
+
+}