You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by vi...@apache.org on 2014/09/25 09:56:11 UTC
svn commit: r1627476 - in /tomcat/tc7.0.x/trunk: ./
java/org/apache/catalina/connector/CoyoteAdapter.java
webapps/docs/changelog.xml
Author: violetagg
Date: Thu Sep 25 07:56:11 2014
New Revision: 1627476
URL: http://svn.apache.org/r1627476
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57011
Merged revision 1627370 from tomcat/trunk:
Ensure that the request and response are correctly recycled when processing errors during async processing.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1627370
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1627476&r1=1627475&r2=1627476&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Thu Sep 25 07:56:11 2014
@@ -340,6 +340,13 @@ public class CoyoteAdapter implements Ad
false);
}
+ // 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/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1627476&r1=1627475&r2=1627476&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Sep 25 07:56:11 2014
@@ -180,6 +180,10 @@
<code>StuckThreadDetectionValve</code>'s JMX bean. Patch provided by
Jiří 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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org