Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50352

Ensure that AsyncListener.onComplete() is fired when AsyncContext.complete() is called.

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

diff --git a/java/org/apache/coyote/AsyncStateMachine.java b/java/org/apache/coyote/AsyncStateMachine.java
index 38f6295..d788ddf 100644 (file)
--- a/java/org/apache/coyote/AsyncStateMachine.java
+++ b/java/org/apache/coyote/AsyncStateMachine.java
@@ -148,6 +148,7 @@ public class AsyncStateMachine {
             state = AsyncState.DISPATCHED;
             return SocketState.ASYNC_END;
         } else if (state == AsyncState.COMPLETING) {
+            asyncCtxt.fireOnComplete();
             state = AsyncState.DISPATCHED;
             return SocketState.ASYNC_END;
         } else if (state == AsyncState.MUST_DISPATCH) {

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a68adf4..383d245 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -63,6 +63,10 @@
         caused by the previous fix for <bug>50159</bug>. (markt) 
       </fix>
       <fix>
+        <bug>50352</bug>: Ensure that <code>AsyncListener.onComplete()</code> is
+        fired when <code>AsyncContext.complete()</code> is called. (markt)
+      </fix>
+      <fix>
         <bug>50358</bug>: Set the correct LifecycleState when stopping instances
         of the deprecated Embedded class. (markt) 
       </fix>