You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2013/04/30 12:33:01 UTC
svn commit: r1477537 - in
/httpcomponents/httpcore/branches/4.2.x/httpcore-nio/src:
main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutor.java
test/java/org/apache/http/nio/protocol/TestHttpAsyncRequestExecutor.java
Author: olegk
Date: Tue Apr 30 10:33:00 2013
New Revision: 1477537
URL: http://svn.apache.org/r1477537
Log:
Request output if request execution handler is not done (has subsequent requests)
Modified:
httpcomponents/httpcore/branches/4.2.x/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutor.java
httpcomponents/httpcore/branches/4.2.x/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncRequestExecutor.java
Modified: httpcomponents/httpcore/branches/4.2.x/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.2.x/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutor.java?rev=1477537&r1=1477536&r2=1477537&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.2.x/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutor.java (original)
+++ httpcomponents/httpcore/branches/4.2.x/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutor.java Tue Apr 30 10:33:00 2013
@@ -373,6 +373,9 @@ public class HttpAsyncRequestExecutor im
}
handler.responseCompleted(context);
state.reset();
+ if (!handler.isDone()) {
+ conn.requestOutput();
+ }
}
private boolean canResponseHaveBody(final HttpRequest request, final HttpResponse response) {
Modified: httpcomponents/httpcore/branches/4.2.x/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncRequestExecutor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.2.x/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncRequestExecutor.java?rev=1477537&r1=1477536&r2=1477537&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.2.x/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncRequestExecutor.java (original)
+++ httpcomponents/httpcore/branches/4.2.x/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncRequestExecutor.java Tue Apr 30 10:33:00 2013
@@ -478,6 +478,7 @@ public class TestHttpAsyncRequestExecuto
state.setRequest(request);
BasicHttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
state.setResponse(response);
+ Mockito.when(this.exchangeHandler.isDone()).thenReturn(Boolean.TRUE);
this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_EXCHANGE_STATE, state);
this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_HANDLER, this.exchangeHandler);
Mockito.when(this.reuseStrategy.keepAlive(response, this.exchangeContext)).thenReturn(true);
@@ -493,6 +494,26 @@ public class TestHttpAsyncRequestExecuto
}
@Test
+ public void testResponseContentOutputCompletedHandlerNotDone() throws Exception {
+ final State state = new HttpAsyncRequestExecutor.State();
+ final HttpRequest request = new BasicHttpRequest("GET", "/");
+ state.setRequest(request);
+ final BasicHttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
+ state.setResponse(response);
+ Mockito.when(this.exchangeHandler.isDone()).thenReturn(Boolean.FALSE);
+ this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_EXCHANGE_STATE, state);
+ this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_HANDLER, this.exchangeHandler);
+ Mockito.when(this.decoder.isCompleted()).thenReturn(Boolean.TRUE);
+
+ this.protocolHandler.inputReady(this.conn, this.decoder);
+
+ Assert.assertEquals(MessageState.READY, state.getRequestState());
+ Assert.assertEquals(MessageState.READY, state.getResponseState());
+ Mockito.verify(this.exchangeHandler).consumeContent(this.decoder, this.conn);
+ Mockito.verify(this.conn).requestOutput();
+ }
+
+ @Test
public void testResponseInvalidState() throws Exception {
State state = new HttpAsyncRequestExecutor.State();
HttpRequest request = new BasicHttpRequest("GET", "/");