Mailing-List: contact commits-help@hc.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "HttpComponents Project" <dev@hc.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1726732 - in /httpcomponents/httpclient/trunk:
 RELEASE_NOTES.txt
 httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClientBuilder.java
Date: Tue, 26 Jan 2016 05:23:31 -0000
To: commits@hc.apache.org
From: ggregory@apache.org
Message-Id: <20160126052331.3AF533A0851@svn01-us-west.apache.org>

Author: ggregory
Date: Tue Jan 26 05:23:30 2016
New Revision: 1726732

URL: http://svn.apache.org/viewvc?rev=1726732&view=rev
Log:
[HTTPCLIENT-1714] Add HttpClientBuilder.setDnsResolver(DnsResolver).

Modified:
    httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
    httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClientBuilder.java

Modified: httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/RELEASE_NOTES.txt?rev=1726732&r1=1726731&r2=1726732&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/RELEASE_NOTES.txt (original)
+++ httpcomponents/httpclient/trunk/RELEASE_NOTES.txt Tue Jan 26 05:23:30 2016
@@ -1,3 +1,14 @@
+Release 5.0-ALPHA2
+-------------------
+
+Changelog:
+-------------------
+
+* [HTTPCLIENT-1714] Add HttpClientBuilder.setDnsResolver(DnsResolver).
+  Contributed by Alexis Thaveau <alexis.thaveau at gmail.com>
+
+
+
 Release 5.0-ALPHA1
 -------------------
 

Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClientBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClientBuilder.java?rev=1726732&r1=1726731&r2=1726732&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClientBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClientBuilder.java Tue Jan 26 05:23:30 2016
@@ -43,6 +43,7 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;
 
 import org.apache.hc.client5.http.ConnectionKeepAliveStrategy;
+import org.apache.hc.client5.http.DnsResolver;
 import org.apache.hc.client5.http.SchemePortResolver;
 import org.apache.hc.client5.http.SystemDefaultDnsResolver;
 import org.apache.hc.client5.http.auth.AuthSchemeProvider;
@@ -170,6 +171,7 @@ public class HttpClientBuilder {
     private AuthenticationStrategy proxyAuthStrategy;
     private UserTokenHandler userTokenHandler;
     private HttpProcessor httpprocessor;
+    private DnsResolver dnsResolver;
 
     private LinkedList<HttpRequestInterceptor> requestFirst;
     private LinkedList<HttpRequestInterceptor> requestLast;
@@ -686,6 +688,18 @@ public class HttpClientBuilder {
     }
 
     /**
+     * Assigns {@link DnsResolver} instance.
+     * <p>
+     * Please note this value can be overridden by the {@link #setConnectionManager(HttpClientConnectionManager)}
+     * method.
+     * </p>
+     */
+    public final HttpClientBuilder setDnsResolver(final DnsResolver dnsResolver) {
+        this.dnsResolver = dnsResolver;
+        return this;
+    }
+
+    /**
      * Assigns default {@link org.apache.hc.client5.http.auth.AuthScheme} registry which will
      * be used for request execution if not explicitly set in the client execution
      * context.
@@ -906,7 +920,7 @@ public class HttpClientBuilder {
                         .build(),
                     null,
                     null,
-                    null,
+                    dnsResolver,
                     connTimeToLive,
                     connTimeToLiveTimeUnit != null ? connTimeToLiveTimeUnit : TimeUnit.MILLISECONDS);
             if (defaultSocketConfig != null) {