hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1231229 - in /httpcomponents/httpcore/trunk/httpcore-nio/src: main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutor.java test/java/org/apache/http/nio/protocol/TestHttpAsyncRequestExecutor.java
Date Fri, 13 Jan 2012 18:30:45 GMT
Author: olegk
Date: Fri Jan 13 18:30:45 2012
New Revision: 1231229

URL: http://svn.apache.org/viewvc?rev=1231229&view=rev
Log:
HttpAsyncRequestExecutor must not invalidate the execution handler upon connection close (the
message exchange may span accross multiple non-persistent connections

Modified:
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncRequestExecutor.java

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutor.java?rev=1231229&r1=1231228&r2=1231229&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutor.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutor.java
Fri Jan 13 18:30:45 2012
@@ -104,7 +104,6 @@ public class HttpAsyncRequestExecutor im
         State state = getState(conn);
         if (state != null) {
             synchronized (state) {
-                closeHandler(state);
                 state.reset();
             }
         }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncRequestExecutor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncRequestExecutor.java?rev=1231229&r1=1231228&r2=1231229&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncRequestExecutor.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncRequestExecutor.java
Fri Jan 13 18:30:45 2012
@@ -121,10 +121,9 @@ public class TestHttpAsyncRequestExecuto
 
         this.protocolHandler.closed(this.conn);
 
-        Assert.assertNull(state.getHandler());
         Assert.assertEquals(MessageState.READY, state.getRequestState());
         Assert.assertEquals(MessageState.READY, state.getResponseState());
-        Mockito.verify(this.exchangeHandler).close();
+        Mockito.verify(this.exchangeHandler, Mockito.never()).close();
     }
 
     @Test



Mime
View raw message