craigmcc 01/04/25 20:12:53
Modified: catalina/src/share/org/apache/catalina/core
StandardWrapperValve.java
Log:
Oops, deal with a NullPointerException issue of the servlet exception
does *not* wrap a root cause.
Revision Changes Path
1.25 +8 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java
Index: StandardWrapperValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- StandardWrapperValve.java 2001/04/26 03:09:07 1.24
+++ StandardWrapperValve.java 2001/04/26 03:12:51 1.25
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v
1.24 2001/04/26 03:09:07 craigmcc Exp $
- * $Revision: 1.24 $
- * $Date: 2001/04/26 03:09:07 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v
1.25 2001/04/26 03:12:51 craigmcc Exp $
+ * $Revision: 1.25 $
+ * $Date: 2001/04/26 03:12:51 $
*
* ====================================================================
*
@@ -103,7 +103,7 @@
* <code>StandardWrapper</code> container implementation.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.24 $ $Date: 2001/04/26 03:09:07 $
+ * @version $Revision: 1.25 $ $Date: 2001/04/26 03:12:51 $
*/
final class StandardWrapperValve
@@ -506,7 +506,10 @@
ErrorPage errorPage = findErrorPage(context, realError);
if ((errorPage == null) && (realError instanceof ServletException)) {
realError = ((ServletException) exception).getRootCause();
- errorPage = findErrorPage(context, realError);
+ if (realError != null)
+ errorPage = findErrorPage(context, realError);
+ else
+ realError = exception;
}
if (errorPage != null) {
// if (debug >= 1)
