SeleniumHQ
diff --git a/‎java/client/src/org/openqa/selenium/remote/HttpCommandExecutor.java‎
Lines changed: 12 additions & 6 deletions b/‎java/client/src/org/openqa/selenium/remote/HttpCommandExecutor.java‎
Lines changed: 12 additions & 6 deletions
@@ -45,8 +45,6 @@
 
 public class HttpCommandExecutor implements CommandExecutor, NeedsLocalLogs {
 
-  private static final HttpClient.Factory defaultClientFactory = HttpClient.Factory.createDefault();
-
   private final URL remoteServer;
   private final HttpClient client;
   private final HttpClient.Factory httpClientFactory;
@@ -56,14 +54,22 @@ public class HttpCommandExecutor implements CommandExecutor, NeedsLocalLogs {
 
   private LocalLogs logs = LocalLogs.getNullLogger();
 
+  private static class DefaultClientFactoryHolder {
+    static HttpClient.Factory defaultClientFactory = HttpClient.Factory.createDefault();
+  }
+
+  public static HttpClient.Factory getDefaultClientFactory() {
+    return DefaultClientFactoryHolder.defaultClientFactory;
+  }
+
   public HttpCommandExecutor(URL addressOfRemoteServer) {
     this(emptyMap(), Require.nonNull("Server URL", addressOfRemoteServer));
   }
 
   public HttpCommandExecutor(ClientConfig config) {
     this(emptyMap(),
-         Require.nonNull("HTTP client configuration", config),
-         defaultClientFactory);
+      Require.nonNull("HTTP client configuration", config),
+      getDefaultClientFactory());
   }
 
   /**
@@ -78,8 +84,8 @@ public HttpCommandExecutor(
     URL addressOfRemoteServer)
   {
     this(Require.nonNull("Additional commands", additionalCommands),
-         Require.nonNull("Server URL", addressOfRemoteServer),
-         defaultClientFactory);
+      Require.nonNull("Server URL", addressOfRemoteServer),
+      getDefaultClientFactory());
   }
 
   public HttpCommandExecutor(