Author: markt
Date: Fri Jan 9 11:33:27 2015
New Revision: 1650504
URL: http://svn.apache.org/r1650504
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/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardHostValve.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 9 11:33:27 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java?rev=1650504&r1=1650503&r2=1650504&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
Fri Jan 9 11:33:27 2015
@@ -181,7 +181,7 @@ final class StandardHostValve extends Va
}
}
- if (!request.isAsync() && !response.isErrorReportRequired()) {
+ if (!request.isAsync() && (!asyncAtStart ||
!response.isErrorReportRequired())) {
context.fireRequestDestroyEvent(request);
}
} finally {
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardHostValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardHostValve.java?rev=1650504&r1=1650503&r2=1650504&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardHostValve.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardHostValve.java
Fri Jan 9 11:33:27 2015
@@ -17,8 +17,12 @@
package org.apache.catalina.core;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
import javax.servlet.ServletException;
+import javax.servlet.ServletRequestEvent;
+import javax.servlet.ServletRequestListener;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -68,6 +72,48 @@ public class TestStandardHostValve exten
doTestErrorPageHandling(501, "/default");
}
+
+ @Test
+ public void testSRLAfterError() throws Exception {
+ // Set up a container
+ Tomcat tomcat = getTomcatInstance();
+
+ // No file system docBase required
+ Context ctx = tomcat.addContext("", null);
+
+ // Add the error page
+ Tomcat.addServlet(ctx, "error", new ErrorServlet());
+ ctx.addServletMapping("/error", "error");
+
+ final List<String> result = new ArrayList<>();
+
+ // Add the request listener
+ ServletRequestListener servletRequestListener = new
ServletRequestListener() {
+
+ @Override
+ public void requestDestroyed(ServletRequestEvent sre) {
+ result.add("Visit requestDestroyed");
+ }
+
+ @Override
+ public void requestInitialized(ServletRequestEvent sre) {
+ result.add("Visit requestInitialized");
+ }
+
+ };
+ ((StandardContext)
ctx).addApplicationEventListener(servletRequestListener);
+
+ tomcat.start();
+
+ // Request a page that triggers an error
+ ByteChunk bc = new ByteChunk();
+ int rc = getUrl("http://localhost:"; + getPort() +
"/error?errorCode=400", bc, null);
+
+ Assert.assertEquals(400, rc);
+ Assert.assertTrue(result.contains("Visit requestInitialized"));
+ Assert.assertTrue(result.contains("Visit requestDestroyed"));
+ }
+
private void doTestErrorPageHandling(int error, String report)
throws Exception {
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1650504&r1=1650503&r2=1650504&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Fri Jan 9 11:33:27 2015
@@ -45,6 +45,15 @@
issues to not "pop up" wrt. others).
-->
<section name="Tomcat 8.0.17 (markt)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Correct a regression in the previous fix for <bug>57252</bug> that
broke
+ request listeners for non-async requests that triggered an error that
+ was handled by the ErrorReportingValve. (markt/violetagg)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Coyote">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
