Author: markt
Date: Thu Jan 8 19:47:51 2015
New Revision: 1650365
URL: http://svn.apache.org/r1650365
Log:
Fix issue reported during 8.0.16 release testing that requestDestroyed
was not called for a non-async page when the ErrorReportingValve would
be handling the error reporting.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardHostValve.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java?rev=1650365&r1=1650364&r2=1650365&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java Thu Jan
8 19:47:51 2015
@@ -180,7 +180,7 @@ final class StandardHostValve extends Va
}
}
- if (!request.isAsync() && !response.isErrorReportRequired()) {
+ if (!request.isAsync() && (!asyncAtStart ||
!response.isErrorReportRequired())) {
context.fireRequestDestroyEvent(request);
}
} finally {
Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardHostValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardHostValve.java?rev=1650365&r1=1650364&r2=1650365&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardHostValve.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardHostValve.java Thu
Jan 8 19:47:51 2015
@@ -28,7 +28,6 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -73,8 +72,8 @@ public class TestStandardHostValve exten
doTestErrorPageHandling(501, "/default");
}
+
@Test
- @Ignore
public void testSRLAfterError() throws Exception {
// Set up a container
Tomcat tomcat = getTomcatInstance();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
