33 lines
1.7 KiB
Diff
33 lines
1.7 KiB
Diff
|
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManagerBuilder.java
|
||
|
|
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManagerBuilder.java
|
||
|
|
@@ -32,7 +32,6 @@
|
||
|
|
import org.apache.hc.client5.http.SchemePortResolver;
|
||
|
|
import org.apache.hc.client5.http.config.ConnectionConfig;
|
||
|
|
import org.apache.hc.client5.http.config.TlsConfig;
|
||
|
|
-import org.apache.hc.client5.http.ssl.ConscryptClientTlsStrategy;
|
||
|
|
import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
|
||
|
|
import org.apache.hc.core5.function.Resolver;
|
||
|
|
import org.apache.hc.core5.http.HttpHost;
|
||
|
|
@@ -234,18 +233,10 @@ public PoolingAsyncClientConnectionManager build() {
|
||
|
|
if (tlsStrategy != null) {
|
||
|
|
tlsStrategyCopy = tlsStrategy;
|
||
|
|
} else {
|
||
|
|
- if (ReflectionUtils.determineJRELevel() <= 8 && ConscryptClientTlsStrategy.isSupported()) {
|
||
|
|
- if (systemProperties) {
|
||
|
|
- tlsStrategyCopy = ConscryptClientTlsStrategy.getSystemDefault();
|
||
|
|
- } else {
|
||
|
|
- tlsStrategyCopy = ConscryptClientTlsStrategy.getDefault();
|
||
|
|
- }
|
||
|
|
+ if (systemProperties) {
|
||
|
|
+ tlsStrategyCopy = DefaultClientTlsStrategy.getSystemDefault();
|
||
|
|
} else {
|
||
|
|
- if (systemProperties) {
|
||
|
|
- tlsStrategyCopy = DefaultClientTlsStrategy.getSystemDefault();
|
||
|
|
- } else {
|
||
|
|
- tlsStrategyCopy = DefaultClientTlsStrategy.getDefault();
|
||
|
|
- }
|
||
|
|
+ tlsStrategyCopy = DefaultClientTlsStrategy.getDefault();
|
||
|
|
}
|
||
|
|
}
|
||
|
|
final PoolingAsyncClientConnectionManager poolingmgr = new PoolingAsyncClientConnectionManager(
|