svn commit: r1627370 - in /tomcat/trunk: java/org/apache/catalina/connector/CoyoteAdapter.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Sep 24 17:31:13 2014
New Revision: 1627370

URL: http://svn.apache.org/r1627370
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57011
Ensure that the request and response are correctly recycled when processing 
errors during async processing.

Modified:
    tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1627370&r1=1627369&r2=1627370&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Wed Sep 
24 17:31:13 2014
@@ -446,6 +446,13 @@ public class CoyoteAdapter implements Ad
                 }
             }
 
+            // Check to see if the processor is in an error state. If it is,
+            // bail out now.
+            AtomicBoolean error = new AtomicBoolean(false);
+            res.action(ActionCode.IS_ERROR, error);
+            if (error.get()) {
+                success = false;
+            }
         } catch (IOException e) {
             success = false;
             // Ignore

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1627370&r1=1627369&r2=1627370&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Sep 24 17:31:13 2014
@@ -153,6 +153,10 @@
           <code>StuckThreadDetectionValve</code>'s JMX bean. Patch provided by
           Ji&#x159;&#xED; Pejchal. (schultz)
       </add>
+      <fix>
+        <bug>57011</bug>: Ensure that the request and response are correctly
+        recycled when processing errors during async processing. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org