Skip to content

Commit 6086c7d

Browse files
authored
Always catch exceptions from close() (#1414)
1 parent e1586cc commit 6086c7d

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,11 @@ public InputStream getBody() {
378378

379379
@Override
380380
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+
}
382386
}
383387
}
384388
}

docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
import okhttp3.ResponseBody;
1212
import okio.BufferedSink;
1313
import okio.Okio;
14+
import org.slf4j.Logger;
15+
import org.slf4j.LoggerFactory;
1416

1517
import javax.net.ssl.SSLContext;
1618
import javax.net.ssl.X509TrustManager;
@@ -28,6 +30,8 @@
2830

2931
public final class OkDockerHttpClient implements DockerHttpClient {
3032

33+
private static final Logger LOGGER = LoggerFactory.getLogger(OkDockerHttpClient.class);
34+
3135
public static final class Builder {
3236

3337
private URI dockerHost = null;
@@ -267,6 +271,8 @@ public void close() {
267271
CLOSING.set(true);
268272
try {
269273
response.close();
274+
} catch (Exception e) {
275+
LOGGER.debug("Failed to close the response", e);
270276
} finally {
271277
CLOSING.set(previous);
272278
}

0 commit comments

Comments
 (0)