From 6ea600ffed57bc0c8bd3b838eecdb846bb7da612 Mon Sep 17 00:00:00 2001 From: fhanik Date: Tue, 21 Jul 2009 13:11:04 +0000 Subject: [PATCH] We can call dispatch after we dispatched. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@796284 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/connector/AsyncContextImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/connector/AsyncContextImpl.java b/java/org/apache/catalina/connector/AsyncContextImpl.java index 1c14b8c93..daf94429b 100644 --- a/java/org/apache/catalina/connector/AsyncContextImpl.java +++ b/java/org/apache/catalina/connector/AsyncContextImpl.java @@ -80,7 +80,9 @@ public class AsyncContextImpl implements AsyncContext { public void dispatch(ServletContext context, String path) { // TODO SERVLET3 - async - if (this.state.compareAndSet(AsyncState.STARTED, AsyncState.DISPATCHING)) { + if (state.compareAndSet(AsyncState.STARTED, AsyncState.DISPATCHING) || + state.compareAndSet(AsyncState.DISPATCHED, AsyncState.DISPATCHING)) { + if (request.getAttribute(ASYNC_REQUEST_URI)==null) { request.setAttribute(ASYNC_REQUEST_URI, request.getRequestURI()); request.setAttribute(ASYNC_CONTEXT_PATH, request.getContextPath()); @@ -159,7 +161,7 @@ public class AsyncContextImpl implements AsyncContext { if (state.compareAndSet(AsyncState.NOT_STARTED, AsyncState.STARTED)) { this.context = context; } else { - throw new IllegalStateException("Already started."); + throw new IllegalStateException("Start illegal. Invalid state: "+state.get()); } } -- 2.11.0