Author: markt
Date: Fri Feb 13 09:52:11 2015
New Revision: 1659486
URL: http://svn.apache.org/r1659486
Log:
Follow-up to r1658966 which move too many states into the always add to the
poller branch.
Modified:
tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java
Modified: tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java?rev=1659486&r1=1659485&r2=1659486&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8]
(original)
+++ tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8] Fri Feb
13 09:52:11 2015
@@ -298,9 +298,7 @@ public class AsyncStateMachine {
boolean doDispatch = false;
if (state == AsyncState.STARTING) {
state = AsyncState.MUST_DISPATCH;
- } else if (state == AsyncState.STARTED ||
- state == AsyncState.TIMING_OUT ||
- state == AsyncState.ERROR) {
+ } else if (state == AsyncState.STARTED) {
state = AsyncState.DISPATCHING;
// A dispatch is always required.
// If on a non-container thread, need to get back onto a container
@@ -309,7 +307,9 @@ public class AsyncStateMachine {
// request/response associated with the AsyncContext so need a new
// container thread to process the different request/response.
doDispatch = true;
- } else if (state == AsyncState.READ_WRITE_OP) {
+ } else if (state == AsyncState.READ_WRITE_OP ||
+ state == AsyncState.TIMING_OUT ||
+ state == AsyncState.ERROR) {
state = AsyncState.DISPATCHING;
// If on a container thread then the socket will be added to the
// poller poller when the thread exits the
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
