It is valid to call startAsync() inside a dispatched request

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@926042 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/AsyncContextImpl.java b/java/org/apache/catalina/core/AsyncContextImpl.java
index a773078..148aff1 100644 (file)
--- a/java/org/apache/catalina/core/AsyncContextImpl.java
+++ b/java/org/apache/catalina/core/AsyncContextImpl.java
@@ -243,7 +243,8 @@ public class AsyncContextImpl implements AsyncContext {
     }
 
     public void setStarted(Context context) {
-        if (state.compareAndSet(AsyncState.NOT_STARTED, AsyncState.STARTED)) {
+        if (state.compareAndSet(AsyncState.NOT_STARTED, AsyncState.STARTED) ||
+                state.compareAndSet(AsyncState.DISPATCHED, AsyncState.STARTED)) {
             this.context = context;
         } else {
             throw new IllegalStateException("Start illegal. Invalid state: "+state.get());