Author: fhanik
Date: Fri Mar 26 16:21:57 2010
New Revision: 927951
URL: http://svn.apache.org/viewvc?rev=927951&view=rev
Log:
Adjust startAsync().complete() behavior
Modified:
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=927951&r1=927950&r2=927951&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Fri Mar 26
16:21:57 2010
@@ -74,8 +74,10 @@ public class AsyncContextImpl implements
public void complete() {
if (state.get()==AsyncState.COMPLETING) {
//do nothing
- } else if (state.compareAndSet(AsyncState.STARTED,
AsyncState.COMPLETING) ||
- state.compareAndSet(AsyncState.DISPATCHED, AsyncState.COMPLETING))
{
+ } else if (state.compareAndSet(AsyncState.STARTED,
AsyncState.COMPLETING)) {
+ // TODO SERVLET3 - async
+ doInternalComplete(false);
+ } else if (state.compareAndSet(AsyncState.DISPATCHED,
AsyncState.COMPLETING)) {
// TODO SERVLET3 - async
AtomicBoolean dispatched = new AtomicBoolean(false);
request.getCoyoteRequest().action(ActionCode.ACTION_ASYNC_COMPLETE,dispatched);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
