Don't override connection manager

2 files changed, 4 insertions, 17 deletions

diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/health/ApacheHttpClient.java b/service-monitor/src/main/java/com/yahoo/vespa/service/health/ApacheHttpClient.java
index cdb7c03c999..dfd2123a849 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/health/ApacheHttpClient.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/health/ApacheHttpClient.java
@@ -6,14 +6,9 @@ import org.apache.http.HttpResponse;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.config.Registry;
-import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.ConnectionKeepAliveStrategy;
-import org.apache.http.conn.HttpClientConnectionManager;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.DefaultConnectionKeepAliveStrategy;
-import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
 import org.apache.http.protocol.HttpContext;
 
 import java.io.IOException;
@@ -32,13 +27,7 @@ class ApacheHttpClient implements AutoCloseable {
         T handle(CloseableHttpResponse httpResponse) throws Exception;
     }
 
-    static CloseableHttpClient makeCloseableHttpClient(URL url, Duration timeout, Duration keepAlive, ConnectionSocketFactory socketFactory) {
-        Registry<ConnectionSocketFactory> registry = RegistryBuilder.<ConnectionSocketFactory>create()
-                .register(url.getProtocol(),socketFactory)
-                .build();
-
-        HttpClientConnectionManager connectionManager = new BasicHttpClientConnectionManager(registry);
-
+    static CloseableHttpClient makeCloseableHttpClient(URL url, Duration timeout, Duration keepAlive) {
         RequestConfig requestConfig = RequestConfig.custom()
                 .setConnectTimeout((int) timeout.toMillis()) // establishment of connection
                 .setConnectionRequestTimeout((int) timeout.toMillis())  // connection from connection manager
@@ -59,14 +48,13 @@ class ApacheHttpClient implements AutoCloseable {
 
         return VespaHttpClientBuilder.createWithBasicConnectionManager()
                 .setKeepAliveStrategy(keepAliveStrategy)
-                .setConnectionManager(connectionManager)
                 .disableAutomaticRetries()
                 .setDefaultRequestConfig(requestConfig)
                 .build();
     }
 
-    ApacheHttpClient(URL url, Duration timeout, Duration keepAlive, ConnectionSocketFactory socketFactory) {
-        this(url, makeCloseableHttpClient(url, timeout, keepAlive, socketFactory));
+    ApacheHttpClient(URL url, Duration timeout, Duration keepAlive) {
+        this(url, makeCloseableHttpClient(url, timeout, keepAlive));
     }
 
     ApacheHttpClient(URL url, CloseableHttpClient client) {
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthClient.java b/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthClient.java
index ede11c48de4..19399c79b43 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthClient.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthClient.java
@@ -5,7 +5,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yahoo.log.LogLevel;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.conn.socket.PlainConnectionSocketFactory;
 import org.apache.http.util.EntityUtils;
 
 import java.io.IOException;
@@ -30,7 +29,7 @@ public class StateV1HealthClient implements AutoCloseable {
     private final Function<HttpEntity, String> getContentFunction;
 
     StateV1HealthClient(URL url, Duration requestTimeout, Duration connectionKeepAlive) {
-        this(new ApacheHttpClient(url, requestTimeout, connectionKeepAlive, PlainConnectionSocketFactory.getSocketFactory()),
+        this(new ApacheHttpClient(url, requestTimeout, connectionKeepAlive),
                 entity -> uncheck(() -> EntityUtils.toString(entity)));
     }