diff options
| author | Shireesh Anjal <shireesh@gluster.com> | 2011-08-03 22:40:54 +0530 |
|---|---|---|
| committer | Shireesh Anjal <shireesh@gluster.com> | 2011-08-03 22:40:54 +0530 |
| commit | 8620646918d74718835ce3488fbab6bae0abc292 (patch) | |
| tree | caff14110afd326ecd8ceeea4f7156e84892e281 /src | |
| parent | 81f10db44a39db867112dbdc7e64fe5d892155b3 (diff) | |
Modified to handle error conditions properly.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java index c570252e..3c9832d3 100644 --- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java +++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java @@ -167,9 +167,7 @@ public abstract class AbstractClient { try {
response = res.header(HTTP_HEADER_AUTH, authHeader).accept(MediaType.APPLICATION_OCTET_STREAM)
.get(ClientResponse.class);
- if (response.getStatus() >= 300) {
- throw new GlusterRuntimeException(response.getEntity(String.class));
- }
+ checkResponseStatus(response);
} catch (Exception e1) {
throw createGlusterException(e1);
}
@@ -264,7 +262,9 @@ public abstract class AbstractClient { private ClientResponse postRequest(WebResource resource, Form form) {
try {
- return prepareFormRequestBuilder(resource).post(ClientResponse.class, form);
+ ClientResponse response = prepareFormRequestBuilder(resource).post(ClientResponse.class, form);
+ checkResponseStatus(response);
+ return response;
} catch (UniformInterfaceException e) {
throw new GlusterRuntimeException(e.getResponse().getEntity(String.class));
}
@@ -309,20 +309,24 @@ public abstract class AbstractClient { private ClientResponse putRequest(WebResource resource, Form form) {
try {
ClientResponse response = prepareFormRequestBuilder(resource).put(ClientResponse.class, form);
- if ((response.getStatus() == Response.Status.UNAUTHORIZED.getStatusCode())) {
- // authentication failed. clear security token.
- setSecurityToken(null);
- throw new GlusterRuntimeException("Invalid credentials!");
- }
- if (response.getStatus() >= 300) {
- throw new GlusterRuntimeException(response.getEntity(String.class));
- }
+ checkResponseStatus(response);
return response;
} catch (Exception e) {
throw createGlusterException(e);
}
}
+ private void checkResponseStatus(ClientResponse response) {
+ if ((response.getStatus() == Response.Status.UNAUTHORIZED.getStatusCode())) {
+ // authentication failed. clear security token.
+ setSecurityToken(null);
+ throw new GlusterRuntimeException("Invalid credentials!");
+ }
+ if (response.getStatus() >= 300) {
+ throw new GlusterRuntimeException(response.getEntity(String.class));
+ }
+ }
+
public Builder prepareFormRequestBuilder(WebResource resource) {
return resource.type(MediaType.APPLICATION_FORM_URLENCODED_TYPE).header(HTTP_HEADER_AUTH, authHeader)
.accept(MediaType.APPLICATION_XML);
|