HTTPCLIENT-2315: client builders fails to apply system properties to the default connection manager

ok2c · ok2c · commit 679991ae33ce · 2024-01-08T15:25:50.000+01:00
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java
@@ -779,7 +779,11 @@ protected void addCloseable(final Closeable closeable) {
     public CloseableHttpAsyncClient build() {
         AsyncClientConnectionManager connManagerCopy = this.connManager;
         if (connManagerCopy == null) {
-            connManagerCopy = PoolingAsyncClientConnectionManagerBuilder.create().build();
+            final PoolingAsyncClientConnectionManagerBuilder connectionManagerBuilder = PoolingAsyncClientConnectionManagerBuilder.create();
+            if (systemProperties) {
+                connectionManagerBuilder.useSystemProperties();
+            }
+            connManagerCopy = connectionManagerBuilder.build();
         }
 
         ConnectionKeepAliveStrategy keepAliveStrategyCopy = this.keepAliveStrategy;
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java
@@ -749,7 +749,11 @@ public CloseableHttpClient build() {
         }
         HttpClientConnectionManager connManagerCopy = this.connManager;
         if (connManagerCopy == null) {
-            connManagerCopy = PoolingHttpClientConnectionManagerBuilder.create().build();
+            final PoolingHttpClientConnectionManagerBuilder connectionManagerBuilder = PoolingHttpClientConnectionManagerBuilder.create();
+            if (systemProperties) {
+                connectionManagerBuilder.useSystemProperties();
+            }
+            connManagerCopy = connectionManagerBuilder.build();
         }
         ConnectionReuseStrategy reuseStrategyCopy = this.reuseStrategy;
         if (reuseStrategyCopy == null) {

Original file line number	Diff line number	Diff line change
`@@ -749,7 +749,11 @@ public CloseableHttpClient build() {`
`749`	`749`	`}`
`750`	`750`	`HttpClientConnectionManager connManagerCopy = this.connManager;`
`751`	`751`	`if (connManagerCopy == null) {`
`752`		`- connManagerCopy = PoolingHttpClientConnectionManagerBuilder.create().build();`
	`752`	`+ final PoolingHttpClientConnectionManagerBuilder connectionManagerBuilder = PoolingHttpClientConnectionManagerBuilder.create();`
	`753`	`+ if (systemProperties) {`
	`754`	`+ connectionManagerBuilder.useSystemProperties();`
	`755`	`+ }`
	`756`	`+ connManagerCopy = connectionManagerBuilder.build();`
`753`	`757`	`}`
`754`	`758`	`ConnectionReuseStrategy reuseStrategyCopy = this.reuseStrategy;`
`755`	`759`	`if (reuseStrategyCopy == null) {`