From 2bd87eaa7b9413b97aaea70f7b8f1f40ab7fa967 Mon Sep 17 00:00:00 2001 From: fhanik Date: Fri, 26 Mar 2010 13:38:02 +0000 Subject: [PATCH] spec says that "started" is defined as started until the thread has returned to the container. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@927845 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/connector/CoyoteAdapter.java | 2 +- java/org/apache/catalina/core/AsyncContextImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java b/java/org/apache/catalina/connector/CoyoteAdapter.java index d8e8d2226..aebfffa92 100644 --- a/java/org/apache/catalina/connector/CoyoteAdapter.java +++ b/java/org/apache/catalina/connector/CoyoteAdapter.java @@ -428,7 +428,7 @@ public class CoyoteAdapter implements Adapter { } AsyncContextImpl asyncConImpl = (AsyncContextImpl)request.getAsyncContext(); - if (request.isAsyncStarted()) { + if (asyncConImpl!=null && asyncConImpl.getState()==AsyncContextImpl.AsyncState.STARTED) { res.action(ActionCode.ACTION_ASYNC_START, request.getAsyncContext()); async = true; } else if (asyncConImpl!=null && diff --git a/java/org/apache/catalina/core/AsyncContextImpl.java b/java/org/apache/catalina/core/AsyncContextImpl.java index 148aff195..0a4085809 100644 --- a/java/org/apache/catalina/core/AsyncContextImpl.java +++ b/java/org/apache/catalina/core/AsyncContextImpl.java @@ -239,7 +239,7 @@ public class AsyncContextImpl implements AsyncContext { } public boolean isStarted() { - return (state.get() == AsyncState.STARTED); + return (state.get() == AsyncState.STARTED || state.get() == AsyncState.DISPATCHING); } public void setStarted(Context context) { -- 2.11.0