Use a single, shared TlsContext instance

The configuration is based on environment variables, which are effectively fixed through the life of the JVM instance.
This simplifaction removes the need for complex cleanup logic based on manual reference counting and weak references.

2 files changed, 2 insertions, 2 deletions

diff --git a/http-utils/src/main/java/ai/vespa/util/http/VespaAsyncHttpClientBuilder.java b/http-utils/src/main/java/ai/vespa/util/http/VespaAsyncHttpClientBuilder.java
index 6c53ea0dc69..f5457e17e96 100644
--- a/http-utils/src/main/java/ai/vespa/util/http/VespaAsyncHttpClientBuilder.java
+++ b/http-utils/src/main/java/ai/vespa/util/http/VespaAsyncHttpClientBuilder.java
@@ -45,7 +45,7 @@ public class VespaAsyncHttpClientBuilder {
 
     public static HttpAsyncClientBuilder create(AsyncConnectionManagerFactory factory) {
         HttpAsyncClientBuilder clientBuilder = HttpAsyncClientBuilder.create();
-        TlsContext vespaTlsContext = TransportSecurityUtils.createTlsContext().orElse(null);
+        TlsContext vespaTlsContext = TransportSecurityUtils.getSystemTlsContext().orElse(null);
         TlsStrategy tlsStrategy;
         if (vespaTlsContext != null) {
             SSLParameters vespaTlsParameters = vespaTlsContext.parameters();
diff --git a/http-utils/src/main/java/ai/vespa/util/http/VespaHttpClientBuilder.java b/http-utils/src/main/java/ai/vespa/util/http/VespaHttpClientBuilder.java
index a408b0d79ae..741570e950b 100644
--- a/http-utils/src/main/java/ai/vespa/util/http/VespaHttpClientBuilder.java
+++ b/http-utils/src/main/java/ai/vespa/util/http/VespaHttpClientBuilder.java
@@ -78,7 +78,7 @@ public class VespaHttpClientBuilder {
     }
 
     private static void addSslSocketFactory(HttpClientBuilder builder, ConnectionManagerFactory connectionManagerFactory)  {
-        TransportSecurityUtils.createTlsContext()
+        TransportSecurityUtils.getSystemTlsContext()
                 .ifPresent(tlsContext -> {
                     log.log(Level.FINE, "Adding ssl socket factory to client");
                     SSLConnectionSocketFactory socketFactory = createSslSocketFactory(tlsContext);