Fix resource leak in error the error handler

fbuecklers · fbuecklers · commit 055a028e757d · 2018-01-15T20:53:55.000+01:00
diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.jaxrs.filter;
 
-import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
@@ -58,33 +57,24 @@ public void filter(ClientRequestContext requestContext, ClientResponseContext re
 
     private String getBodyAsMessage(ClientResponseContext responseContext) throws IOException {
         if (responseContext.hasEntity()) {
-            int contentLength = responseContext.getLength();
-            if (contentLength != -1) {
-                byte[] buffer = new byte[contentLength];
-                try {
-                    InputStream entityStream = responseContext.getEntityStream();
-                    IOUtils.readFully(entityStream, buffer);
-                    entityStream.close();
-                } catch (EOFException e) {
-                    return null;
-                }
+            try (InputStream entityStream = responseContext.getEntityStream()) {
                 Charset charset = null;
                 MediaType mediaType = responseContext.getMediaType();
                 if (mediaType != null) {
                     String charsetName = mediaType.getParameters().get("charset");
                     if (charsetName != null) {
                         try {
                             charset = Charset.forName(charsetName);
-                        } catch (Exception e) {
-                            // Do noting...
-                        }
+                        } catch (Exception ignored) { }
                     }
                 }
+
                 if (charset == null) {
                     charset = Charset.defaultCharset();
                 }
-                return new String(buffer, charset);
-            }
+
+                return IOUtils.toString(entityStream, charset);
+            } catch (Exception ignored) { }
         }
         return null;
     }
