diff --git a/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnector.java b/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnector.java index 60c5e83399..6e20244822 100644 --- a/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnector.java +++ b/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -255,10 +255,16 @@ class ApacheConnector implements Connector { } } + final boolean useSystemProperties = + PropertiesHelper.isProperty(config.getProperties(), ApacheClientProperties.USE_SYSTEM_PROPERTIES); + final SSLContext sslContext = client.getSslContext(); final HttpClientBuilder clientBuilder = HttpClientBuilder.create(); - clientBuilder.setConnectionManager(getConnectionManager(client, config, sslContext)); + if (useSystemProperties) { + clientBuilder.useSystemProperties(); + } + clientBuilder.setConnectionManager(getConnectionManager(client, config, sslContext, useSystemProperties)); clientBuilder.setConnectionManagerShared( PropertiesHelper.getValue(config.getProperties(), ApacheClientProperties.CONNECTION_MANAGER_SHARED, false, null)); clientBuilder.setSSLContext(sslContext); @@ -337,7 +343,8 @@ class ApacheConnector implements Connector { private HttpClientConnectionManager getConnectionManager(final Client client, final Configuration config, - final SSLContext sslContext) { + final SSLContext sslContext, + final boolean useSystemProperties) { final Object cmObject = config.getProperties().get(ApacheClientProperties.CONNECTION_MANAGER); // Connection manager from configuration. @@ -355,9 +362,6 @@ private HttpClientConnectionManager getConnectionManager(final Client client, } } - final boolean useSystemProperties = - PropertiesHelper.isProperty(config.getProperties(), ApacheClientProperties.USE_SYSTEM_PROPERTIES); - // Create custom connection manager. return createConnectionManager( client, diff --git a/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5Connector.java b/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5Connector.java index da7ccdd5ce..187dd2ed3d 100644 --- a/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5Connector.java +++ b/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5Connector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -251,10 +251,17 @@ class Apache5Connector implements Connector { } } + final boolean useSystemProperties = + PropertiesHelper.isProperty(config.getProperties(), Apache5ClientProperties.USE_SYSTEM_PROPERTIES); + final SSLContext sslContext = client.getSslContext(); final HttpClientBuilder clientBuilder = HttpClientBuilder.create(); - clientBuilder.setConnectionManager(getConnectionManager(client, config, sslContext)); + if (useSystemProperties) { + clientBuilder.useSystemProperties(); + } + + clientBuilder.setConnectionManager(getConnectionManager(client, config, sslContext, useSystemProperties)); clientBuilder.setConnectionManagerShared( PropertiesHelper.getValue( config.getProperties(), @@ -341,7 +348,8 @@ class Apache5Connector implements Connector { private HttpClientConnectionManager getConnectionManager(final Client client, final Configuration config, - final SSLContext sslContext) { + final SSLContext sslContext, + final boolean useSystemProperties) { final Object cmObject = config.getProperties().get(Apache5ClientProperties.CONNECTION_MANAGER); // Connection manager from configuration. @@ -359,9 +367,6 @@ private HttpClientConnectionManager getConnectionManager(final Client client, } } - final boolean useSystemProperties = - PropertiesHelper.isProperty(config.getProperties(), Apache5ClientProperties.USE_SYSTEM_PROPERTIES); - // Create custom connection manager. return createConnectionManager( client,