Merge pull request #4 from OrbitzWorldwide/handle_http_error

Explicitly set the message from the response body.
rickfast · Jan 12, 2015 · e4d6369 · e4d6369
2 parents 145c380 + 7915f1e
commit e4d6369
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'java'
 apply plugin: 'com.jfrog.bintray'
 apply plugin: 'maven'
 
-version = '0.7'
+version = '0.7.1'
 group = 'com.orbitz.consul'
 
 repositories {

diff --git a/src/main/java/com/orbitz/consul/util/ClientUtil.java b/src/main/java/com/orbitz/consul/util/ClientUtil.java
@@ -136,7 +136,15 @@ public void failed(Throwable throwable) {
     private static <T> ConsulResponse<T> consulResponse(GenericType<T> responseType, Response response) {
 
         if (response.getStatusInfo().getFamily() != Response.Status.Family.SUCCESSFUL) {
-            ServerErrorException see = new ServerErrorException(response);
+            ServerErrorException see = null;
+
+            if (response.hasEntity()) {
+                // Consul sends back error information in the response body
+                String message = response.readEntity(String.class);
+                see = new ServerErrorException(message, response);
+            } else {
+                see = new ServerErrorException(response);
+            }
             response.close();
             throw new ConsulException(see.getLocalizedMessage(), see);
         }