markt 2004/04/12 13:30:42
Modified: catalina/src/share/org/apache/catalina/core
StandardHostValve.java
Log:
- Fix bug 13924. The spec states if an error page declaration doesn't match the
original exception
and the exception is an instance of ServletException then the exception should be
unwrapped
and a second pass made of the error page declarations.
- Ported from TC4.
Revision Changes Path
1.17 +6 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java
Index: StandardHostValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- StandardHostValve.java 27 Feb 2004 14:58:42 -0000 1.16
+++ StandardHostValve.java 12 Apr 2004 20:30:40 -0000 1.17
@@ -192,7 +192,11 @@
return;
}
- ErrorPage errorPage = findErrorPage(context, realError);
+ ErrorPage errorPage = findErrorPage(context, throwable);
+
+ if ((errorPage == null) && (throwable instanceof ServletException)) {
+ errorPage = findErrorPage(context, realError);
+ }
if (errorPage != null) {
response.setAppCommitted(false);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
