Fix ContainX#825 - NullPointerException in HttpClient connector

olivierlemasle · Sep 21, 2016 · 87ffede · 87ffede
1 parent c71dc82
commit 87ffede
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/...tors/httpclient/src/main/java/org/openstack4j/connectors/httpclient/HttpResponseImpl.java b/...tors/httpclient/src/main/java/org/openstack4j/connectors/httpclient/HttpResponseImpl.java
@@ -123,6 +123,8 @@ public Map<String, String> headers() {
     @Override
     public <T> T readEntity(Class<T> typeToReadAs) {
         HttpEntity entity = response.getEntity();
+        if (entity == null || entity.getContent() == null)
+            return null;
         try {
             return ObjectMapperSingleton.getContext(typeToReadAs).reader(typeToReadAs).readValue(entity.getContent());
         } catch (Exception e) {