You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2018/05/18 09:33:05 UTC
svn commit: r1831838 - /httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingNHttpClientConnectionManager.java

Author: olegk
Date: Fri May 18 09:33:05 2018
New Revision: 1831838

URL: http://svn.apache.org/viewvc?rev=1831838&view=rev
Log:
HTTPASYNC-138: added a constructor to PoolingNHttpClientConnectionManager taking SocketAddressResolver as a parameter

Modified:
    httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingNHttpClientConnectionManager.java

Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingNHttpClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingNHttpClientConnectionManager.java?rev=1831838&r1=1831837&r2=1831838&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingNHttpClientConnectionManager.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingNHttpClientConnectionManager.java Fri May 18 09:33:05 2018
@@ -118,7 +118,7 @@ public class PoolingNHttpClientConnectio
     public PoolingNHttpClientConnectionManager(
             final ConnectingIOReactor ioreactor,
             final Registry<SchemeIOSessionStrategy> iosessionFactoryRegistry) {
-        this(ioreactor, null, iosessionFactoryRegistry, null);
+        this(ioreactor, null, iosessionFactoryRegistry, (DnsResolver) null);
     }
 
     public PoolingNHttpClientConnectionManager(
@@ -130,15 +130,22 @@ public class PoolingNHttpClientConnectio
 
     public PoolingNHttpClientConnectionManager(
             final ConnectingIOReactor ioreactor,
+            final NHttpConnectionFactory<ManagedNHttpClientConnection> connFactory,
+            final SocketAddressResolver<HttpRoute> socketAddressResolver) {
+        this(ioreactor, connFactory, getDefaultRegistry(), socketAddressResolver);
+    }
+
+    public PoolingNHttpClientConnectionManager(
+            final ConnectingIOReactor ioreactor,
             final NHttpConnectionFactory<ManagedNHttpClientConnection> connFactory) {
-        this(ioreactor, connFactory, getDefaultRegistry(), null);
+        this(ioreactor, connFactory, getDefaultRegistry(), (DnsResolver) null);
     }
 
     public PoolingNHttpClientConnectionManager(
             final ConnectingIOReactor ioreactor,
             final NHttpConnectionFactory<ManagedNHttpClientConnection> connFactory,
             final Registry<SchemeIOSessionStrategy> iosessionFactoryRegistry) {
-        this(ioreactor, connFactory, iosessionFactoryRegistry, null);
+        this(ioreactor, connFactory, iosessionFactoryRegistry, (DnsResolver) null);
     }
 
     public PoolingNHttpClientConnectionManager(
@@ -154,18 +161,38 @@ public class PoolingNHttpClientConnectio
             final ConnectingIOReactor ioreactor,
             final NHttpConnectionFactory<ManagedNHttpClientConnection> connFactory,
             final Registry<SchemeIOSessionStrategy> iosessionFactoryRegistry,
+            final SocketAddressResolver<HttpRoute> socketAddressResolver) {
+        this(ioreactor, connFactory, iosessionFactoryRegistry, socketAddressResolver,
+                -1, TimeUnit.MILLISECONDS);
+    }
+
+    public PoolingNHttpClientConnectionManager(
+            final ConnectingIOReactor ioreactor,
+            final NHttpConnectionFactory<ManagedNHttpClientConnection> connFactory,
+            final Registry<SchemeIOSessionStrategy> iosessionFactoryRegistry,
             final SchemePortResolver schemePortResolver,
             final DnsResolver dnsResolver,
             final long timeToLive, final TimeUnit tunit) {
+        this(ioreactor, connFactory, iosessionFactoryRegistry,
+                new InternalAddressResolver(schemePortResolver, dnsResolver), timeToLive, tunit);
+    }
+
+    public PoolingNHttpClientConnectionManager(
+            final ConnectingIOReactor ioreactor,
+            final NHttpConnectionFactory<ManagedNHttpClientConnection> connFactory,
+            final Registry<SchemeIOSessionStrategy> iosessionFactoryRegistry,
+            final SocketAddressResolver<HttpRoute> schemePortResolver,
+            final long timeToLive, final TimeUnit tunit) {
         super();
         Args.notNull(ioreactor, "I/O reactor");
         Args.notNull(iosessionFactoryRegistry, "I/O session factory registry");
+        Args.notNull(iosessionFactoryRegistry, "I/O session factory registry");
         this.ioreactor = ioreactor;
         this.configData = new ConfigData();
         this.pool = new CPool(ioreactor,
-            new InternalConnectionFactory(this.configData, connFactory),
-            new InternalAddressResolver(schemePortResolver, dnsResolver),
-            2, 20, timeToLive, tunit != null ? tunit : TimeUnit.MILLISECONDS);
+                new InternalConnectionFactory(this.configData, connFactory),
+                schemePortResolver,
+                2, 20, timeToLive, tunit != null ? tunit : TimeUnit.MILLISECONDS);
         this.iosessionFactoryRegistry = iosessionFactoryRegistry;
     }