hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1544200 - in /httpcomponents/httpclient/trunk: RELEASE_NOTES.txt fluent-hc/src/main/java/org/apache/http/client/fluent/Executor.java fluent-hc/src/main/java/org/apache/http/client/fluent/Request.java
Date Thu, 21 Nov 2013 14:50:56 GMT
Author: olegk
Date: Thu Nov 21 14:50:55 2013
New Revision: 1544200

URL: http://svn.apache.org/r1544200
Log:
HTTPCLIENT-1435: Fluent Executor ignores custom request properties

Modified:
    httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
    httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Executor.java
    httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Request.java

Modified: httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/RELEASE_NOTES.txt?rev=1544200&r1=1544199&r2=1544200&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/RELEASE_NOTES.txt (original)
+++ httpcomponents/httpclient/trunk/RELEASE_NOTES.txt Thu Nov 21 14:50:55 2013
@@ -1,6 +1,9 @@
 Changes since 4.3.1
 -------------------
 
+* [HTTPCLIENT-1435] Fluent Executor ignores custom request properties.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
 * [HTTPCLIENT-1432] Lazy decompressing of HttpEntity#getContent() to avoid EOFException
   in case of an empty response with 'Content-Encoding: gzip' header.
   Contributed by Yihua Huang <code4crafter at gmail.com>

Modified: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Executor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Executor.java?rev=1544200&r1=1544199&r2=1544200&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Executor.java
(original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Executor.java
Thu Nov 21 14:50:55 2013
@@ -210,7 +210,7 @@ public class Executor {
         this.localContext.setAttribute(HttpClientContext.CREDS_PROVIDER, this.credentialsProvider);
         this.localContext.setAttribute(HttpClientContext.AUTH_CACHE, this.authCache);
         this.localContext.setAttribute(HttpClientContext.COOKIE_STORE, this.cookieStore);
-        final HttpRequestBase httprequest = request.getHttpRequest();
+        final HttpRequestBase httprequest = request.prepareRequest();
         httprequest.reset();
         return new Response(this.httpclient.execute(httprequest, this.localContext));
     }

Modified: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Request.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Request.java?rev=1544200&r1=1544199&r2=1544200&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Request.java
(original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Request.java
Thu Nov 21 14:50:55 2013
@@ -134,7 +134,8 @@ public class Request {
         this.configBuilder = RequestConfig.custom();
     }
 
-    HttpRequestBase getHttpRequest() {
+    HttpRequestBase prepareRequest() {
+        this.request.setConfig(this.configBuilder.build());
         return this.request;
     }
 



Mime
View raw message