diff --git a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java index 1d9d65f0a..1ec3fbca0 100644 --- a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java +++ b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java @@ -134,15 +134,17 @@ public void init(DockerClientConfig dockerClientConfig) { clientConfig.register(ResponseStatusExceptionFilter.class); clientConfig.register(JsonClientFilter.class); clientConfig.register(JacksonJsonProvider.class); - + RequestConfig.Builder requestConfigBuilder = RequestConfig.custom(); // logging may disabled via log level clientConfig.register(new SelectiveLoggingFilter(LOGGER, true)); if (readTimeout != null) { + requestConfigBuilder.setSocketTimeout(readTimeout); clientConfig.property(ClientProperties.READ_TIMEOUT, readTimeout); } if (connectTimeout != null) { + requestConfigBuilder.setConnectTimeout(connectTimeout); clientConfig.property(ClientProperties.CONNECT_TIMEOUT, connectTimeout); } @@ -221,9 +223,9 @@ public void shutdown() { // Configure connection pool timeout if (connectionRequestTimeout != null) { - clientConfig.property(ApacheClientProperties.REQUEST_CONFIG, RequestConfig.custom() - .setConnectionRequestTimeout(connectionRequestTimeout).build()); + requestConfigBuilder.setConnectionRequestTimeout(connectionRequestTimeout); } + clientConfig.property(ApacheClientProperties.REQUEST_CONFIG, requestConfigBuilder.build()); ClientBuilder clientBuilder = ClientBuilder.newBuilder().withConfig(clientConfig); if (sslContext != null) {