Author: markt
Date: Wed Oct 29 12:31:12 2014
New Revision: 1635113
URL: http://svn.apache.org/r1635113
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57157
Allow calls to AsyncContext.start(Runnable) during non-blocking IO reads and
writes.
Modified:
tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java?rev=1635113&r1=1635112&r2=1635113&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8]
(original)
+++ tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8] Wed Oct
29 12:31:12 2014
@@ -318,7 +318,8 @@ public class AsyncStateMachine {
}
public synchronized void asyncRun(Runnable runnable) {
- if (state == AsyncState.STARTING || state == AsyncState.STARTED) {
+ if (state == AsyncState.STARTING || state == AsyncState.STARTED ||
+ state == AsyncState.READ_WRITE_OP) {
// Execute the runnable using a container thread from the
// Connector's thread pool. Use a wrapper to prevent a memory leak
ClassLoader oldCL;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1635113&r1=1635112&r2=1635113&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Oct 29 12:31:12 2014
@@ -209,6 +209,11 @@
Trigger an error if an invalid attempt is made to use non-blocking IO.
(markt)
</fix>
+ <fix>
+ <bug>57157</bug>: Allow calls to
+ <code>AsyncContext.start(Runnable)</code> during non-blocking IO reads
+ and writes. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
