Author: markt
Date: Thu Sep 20 09:56:06 2012
New Revision: 1387938
URL: http://svn.apache.org/viewvc?rev=1387938&view=rev
Log:
Correct fix for BZ 53843 that triggered a TCK failure
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1387937
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java?rev=1387938&r1=1387937&r2=1387938&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java Thu Sep
20 09:56:06 2012
@@ -96,7 +96,7 @@ public class AsyncStateMachine<S> {
DISPATCHED(false, false, false),
STARTING(true, true, false),
STARTED(true, true, false),
- MUST_COMPLETE(true, true, false),
+ MUST_COMPLETE(true, false, false),
COMPLETING(true, false, false),
TIMING_OUT(true, false, false),
MUST_DISPATCH(true, true, true),
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1387938&r1=1387937&r2=1387938&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Sep 20 09:56:06 2012
@@ -76,9 +76,9 @@
</update>
<fix>
<bug>53843</bug>: <code>request.isAsyncStarted()</code> must continue
to
- return true until the dispatch/complete actually happens (which at the
- earliest isn't until the thread where <code>startAsync()</code> was
- called returns to the container). (markt)
+ return true until the dispatch actually happens (which at the earliest
+ isn't until the thread where <code>startAsync()</code> was called
+ returns to the container). (markt)
</fix>
<fix>
<bug>53863</bug>: Ensure the the implicit servlets (JSP and default)
are
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
