hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rola...@apache.org
Subject svn commit: r541924 - in /jakarta/httpcomponents/httpclient/trunk/module-client/src: main/java/org/apache/http/impl/client/ test/java/org/apache/http/impl/conn/
Date Sat, 26 May 2007 18:33:57 GMT
Author: rolandw
Date: Sat May 26 11:33:56 2007
New Revision: 541924

URL: http://svn.apache.org/viewvc?view=rev&rev=541924
Log:
params refactoring, step 3 - HttpRequestExecutor no longer links params

Modified:
    jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/client/DefaultClientRequestDirector.java
    jakarta/httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/ExecReqThread.java
    jakarta/httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/Helper.java
    jakarta/httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/TestLocalServer.java

Modified: jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/client/DefaultClientRequestDirector.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/client/DefaultClientRequestDirector.java?view=diff&rev=541924&r1=541923&r2=541924
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/client/DefaultClientRequestDirector.java
(original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/client/DefaultClientRequestDirector.java
Sat May 26 11:33:56 2007
@@ -338,7 +338,8 @@
                         targetAuthState);
                 context.setAttribute(HttpClientContext.PROXY_AUTH_STATE,
                         proxyAuthState);
-                
+                //@@@ review parameter hierachy building
+                request.getParams().setDefaults(requestExec.getParams());
                 requestExec.preProcess(request, httpProcessor, context);
                 
                 if (orig instanceof AbortableHttpRequest) {

Modified: jakarta/httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/ExecReqThread.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/ExecReqThread.java?view=diff&rev=541924&r1=541923&r2=541924
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/ExecReqThread.java
(original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/ExecReqThread.java
Sat May 26 11:33:56 2007
@@ -102,6 +102,7 @@
 
             HttpRequest request = (HttpRequest) request_spec.context.
                 getAttribute(HttpExecutionContext.HTTP_REQUEST);
+            request.getParams().setDefaults(request_spec.executor.getParams());
             request_spec.executor.preProcess
                 (request, request_spec.processor, request_spec.context);
 

Modified: jakarta/httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/Helper.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/Helper.java?view=diff&rev=541924&r1=541923&r2=541924
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/Helper.java
(original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/Helper.java
Sat May 26 11:33:56 2007
@@ -66,6 +66,7 @@
         ctxt.setAttribute(HttpExecutionContext.HTTP_TARGET_HOST, target);
         ctxt.setAttribute(HttpExecutionContext.HTTP_REQUEST, req);
 
+        req.getParams().setDefaults(exec.getParams());
         exec.preProcess(req, proc, ctxt);
         HttpResponse rsp = exec.execute(req, conn, ctxt);
         exec.postProcess(rsp, proc, ctxt);

Modified: jakarta/httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/TestLocalServer.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/TestLocalServer.java?view=diff&rev=541924&r1=541923&r2=541924
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/TestLocalServer.java
(original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/TestLocalServer.java
Sat May 26 11:33:56 2007
@@ -85,7 +85,8 @@
                 HttpExecutionContext.HTTP_TARGET_HOST, target);
         httpContext.setAttribute(
                 HttpExecutionContext.HTTP_REQUEST, request);
-        
+        request.getParams().setDefaults(httpExecutor.getParams());
+
         httpExecutor.preProcess
             (request, httpProcessor, httpContext);
         HttpResponse response = httpExecutor.execute
@@ -126,7 +127,8 @@
                     HttpExecutionContext.HTTP_TARGET_HOST, target);
             httpContext.setAttribute(
                     HttpExecutionContext.HTTP_REQUEST, request);
-            
+            request.getParams().setDefaults(httpExecutor.getParams());
+
             httpExecutor.preProcess
                 (request, httpProcessor, httpContext);
             HttpResponse response = httpExecutor.execute



Mime
View raw message