You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by sb...@apache.org on 2008/06/07 20:53:16 UTC

svn commit: r664374 - /httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpClientHandler.java

Author: sberlin
Date: Sat Jun  7 11:53:15 2008
New Revision: 664374

URL: http://svn.apache.org/viewvc?rev=664374&view=rev
Log:
shift HttpProcessor.process to before entity is consumed

Modified:
    httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpClientHandler.java

Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpClientHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpClientHandler.java?rev=664374&r1=664373&r2=664374&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpClientHandler.java (original)
+++ httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpClientHandler.java Sat Jun  7 11:53:15 2008
@@ -278,9 +278,13 @@
                     cancelRequest(conn, connState);
                 }
             }
+
+            context.setAttribute(ExecutionContext.HTTP_RESPONSE, response);
+            
             if (!canResponseHaveBody(request, response)) {
                 conn.resetInput();
                 response.setEntity(null);
+                this.httpProcessor.process(response, context);
                 processResponse(conn, connState);
             } else {
                 HttpEntity entity = response.getEntity();
@@ -293,6 +297,7 @@
                     }
                     response.setEntity(consumingEntity);
                     connState.setConsumingEntity(consumingEntity);
+                    this.httpProcessor.process(response, context);
                 }
             }
 
@@ -369,10 +374,6 @@
         HttpContext context = conn.getContext();
         HttpResponse response = connState.getResponse();
 
-        context.setAttribute(ExecutionContext.HTTP_RESPONSE, response);
-
-        this.httpProcessor.process(response, context);
-
         this.execHandler.handleResponse(response, context);
 
         if (!this.connStrategy.keepAlive(response, context)) {