Author: markt
Date: Fri Sep 2 11:33:05 2011
New Revision: 1164482
URL: http://svn.apache.org/viewvc?rev=1164482&view=rev
Log: (empty)
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 2 11:33:05 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java?rev=1164482&r1=1164481&r2=1164482&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
Fri Sep 2 11:33:05 2011
@@ -164,7 +164,13 @@ final class StandardHostValve extends Va
if (asyncAtStart || context.fireRequestInitEvent(request)) {
// Ask this Context to process this request
- context.getPipeline().getFirst().invoke(request, response);
+ try {
+ context.getPipeline().getFirst().invoke(request, response);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+ request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, t);
+ throwable(request, response, t);
+ }
// If the request was async at the start and an error occurred then
// the async error handling will kick-in and that will fire the
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=1164482&r1=1164481&r2=1164482&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Sep 2 11:33:05 2011
@@ -57,6 +57,12 @@
<subsection name="Catalina">
<changelog>
<fix>
+ <bug>51550</bug>: An additional change that ensures any exceptions
+ thrown by an Authenticator (or any other Valve configured for the
+ Context) will be handled by the custom error pages for the Context if
an
+ appropriate error page is configured. (markt)
+ </fix>
+ <fix>
<bug>51744</bug>: Prevent application code from closing the associated
JNDI context while the application is running. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
