ResponseStatusExceptionFilter: Fix unwrap of JSON message

hugares · hugares · commit fedf1e58cc3f · 2019-07-16T08:55:10.000-04:00
Reading the entity stream a second time without resetting it was causing the ObjectMapper to return null then a NullPointerExceptions when calling get('message') method on it. Fix the issue by creating the ObjectMapper from the String representation of the entity stream instead of resetting the stream to read it a second time. Also check to make sure the returned JsonNode is not null and that the content is text. Closes #1222
diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
@@ -79,13 +79,18 @@ private String getBodyAsMessage(ClientResponseContext responseContext) {
                 String message = IOUtils.toString(entityStream, charset);
 
                 if (MediaType.APPLICATION_JSON_TYPE.equals(mediaType)) {
-                    ObjectMapper mapper = new ObjectMapper();
-                    JsonNode node = mapper.readTree(entityStream).get("message");
-                    if (node != null) {
-                        message = node.textValue();
+                    try {
+                        JsonNode node = new ObjectMapper().readTree(message);
+                        if (node != null) {
+                            JsonNode messageNode = node.get("message");
+                            if (messageNode != null && messageNode.isTextual()) {
+                                message = messageNode.textValue();
+                            }
+                        }
+                    } catch (IOException ignored) {
+                        //ignore parsing errors and return the message as is
                     }
                 }
-
                 return message;
             } catch (Exception ignored) { }
         }
