add property http.client.useThreadLocal

Author: jrivard

server/src/main/java/password/pwm/AppProperty.java

@@ -133,6 +133,7 @@ public enum AppProperty
     HTTP_CLIENT_IMPLEMENTATION                      ( "http.client.implementation" ),
     HTTP_CLIENT_ENABLE_HOSTNAME_VERIFICATION        ( "http.client.enableHostnameVerification" ),
     HTTP_CLIENT_PROMISCUOUS_WORDLIST_ENABLE         ( "http.client.promiscuous.wordlist.enable" ),
+    HTTP_CLIENT_USE_THREAD_LOCAL                    ( "http.client.useThreadLocal" ),
     HTTP_ENABLE_GZIP                                ( "http.gzip.enable" ),
     HTTP_ERRORS_ALLOW_HTML                          ( "http.errors.allowHtml" ),
     HTTP_HEADER_SERVER                              ( "http.header.server" ),

server/src/main/java/password/pwm/svc/httpclient/HttpClientService.java

@@ -48,7 +48,7 @@ public class HttpClientService extends AbstractPwmService implements PwmService
 
     private Class<PwmHttpClientProvider> httpClientClass;
     private PwmApplication pwmApplication;
-
+    private boolean useThreadLocals = false;
     private final Map<PwmHttpClientConfiguration, ThreadLocal<PwmHttpClientProvider>> clients = new ConcurrentHashMap<>(  );
     private final Map<PwmHttpClientProvider, Object> issuedClients = Collections.synchronizedMap( new WeakHashMap<>(  ) );
 
@@ -72,6 +72,8 @@ public void init( final PwmApplication pwmApplication )
             throws PwmException
     {
         this.pwmApplication = pwmApplication;
+        this.useThreadLocals = pwmApplication.getConfig().readBooleanAppProperty( AppProperty.HTTP_CLIENT_USE_THREAD_LOCAL );
+
         final String implClassName = pwmApplication.getConfig().readAppProperty( AppProperty.HTTP_CLIENT_IMPLEMENTATION );
         try
         {
@@ -115,23 +117,31 @@ public PwmHttpClient getPwmHttpClient( final PwmHttpClientConfiguration pwmHttpC
     {
         Objects.requireNonNull( pwmHttpClientConfiguration );
 
-        final ThreadLocal<PwmHttpClientProvider> threadLocal = clients.computeIfAbsent(
-                pwmHttpClientConfiguration,
-                clientConfig -> new ThreadLocal<>() );
-
-        final PwmHttpClient existingClient = threadLocal.get();
-        if ( existingClient != null && existingClient.isOpen() )
+        if ( useThreadLocals )
         {
-            stats.increment( StatsKey.reusedClients );
-            return existingClient;
+            final ThreadLocal<PwmHttpClientProvider> threadLocal = clients.computeIfAbsent(
+                    pwmHttpClientConfiguration,
+                    clientConfig -> new ThreadLocal<>() );
+
+            final PwmHttpClient existingClient = threadLocal.get();
+            if ( existingClient != null && existingClient.isOpen() )
+            {
+                stats.increment( StatsKey.reusedClients );
+                return existingClient;
+            }
         }
 
         try
         {
             final PwmHttpClientProvider newClient = httpClientClass.getDeclaredConstructor().newInstance();
             newClient.init( pwmApplication, this, pwmHttpClientConfiguration );
             issuedClients.put( newClient, null );
-            threadLocal.set( newClient );
+
+            if ( useThreadLocals )
+            {
+                clients.get( pwmHttpClientConfiguration ).set( newClient );
+            }
+
             stats.increment( StatsKey.createdClients );
             return newClient;
         }

server/src/main/resources/password/pwm/AppProperty.properties

@@ -133,6 +133,7 @@ http.client.response.maxSize=20000000
 http.client.enableHostnameVerification=true
 http.client.promiscuous.wordlist.enable=true
 http.client.implementation=password.pwm.svc.httpclient.ApachePwmHttpClient
+http.client.useThreadLocal=false
 http.header.server=@PwmAppName@
 http.header.sendContentLanguage=true
 http.header.sendXAmb=true