Always catch exceptions from close() (docker-java#1414)

bsideup · web-flow · commit 6086c7db6e9b · 2020-06-16T14:58:24.000+02:00
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
@@ -378,7 +378,11 @@ public InputStream getBody() {
 
         @Override
         public void close() {
-            response.close();
+            try {
+                response.close();
+            } catch (Exception e) {
+                LOGGER.debug("Failed to close the response", e);
+            }
         }
     }
 }
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
@@ -11,6 +11,8 @@
 import okhttp3.ResponseBody;
 import okio.BufferedSink;
 import okio.Okio;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.X509TrustManager;
@@ -28,6 +30,8 @@
 
 public final class OkDockerHttpClient implements DockerHttpClient {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(OkDockerHttpClient.class);
+
     public static final class Builder {
 
         private URI dockerHost = null;
@@ -267,6 +271,8 @@ public void close() {
             CLOSING.set(true);
             try {
                 response.close();
+            } catch (Exception e) {
+                LOGGER.debug("Failed to close the response", e);
             } finally {
                 CLOSING.set(previous);
             }

Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,11 @@ public InputStream getBody() {`
`378`	`378`
`379`	`379`	`@Override`
`380`	`380`	`public void close() {`
`381`		`- response.close();`
	`381`	`+ try {`
	`382`	`+ response.close();`
	`383`	`+ } catch (Exception e) {`
	`384`	`+ LOGGER.debug("Failed to close the response", e);`
	`385`	`+ }`
`382`	`386`	`}`
`383`	`387`	`}`
`384`	`388`	`}`