remm 2002/11/07 02:51:15
Modified: jasper2/src/share/org/apache/jasper/runtime
PageContextImpl.java
Log:
- Fix Watchdog failures.
Revision Changes Path
1.32 +6 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java
Index: PageContextImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- PageContextImpl.java 7 Nov 2002 00:49:53 -0000 1.31
+++ PageContextImpl.java 7 Nov 2002 10:51:14 -0000 1.32
@@ -581,11 +581,13 @@
} catch (IllegalStateException ise) {
include(errorPageURL);
}
+
// The error page could be inside an include.
Object
newException=request.getAttribute("javax.servlet.error.exception");
- if( (newException!= null) && (newException==origException) ) {
+ if ((origException == null) ||
+ ((newException != null) && (newException == origException))) {
request.removeAttribute("javax.servlet.error.exception");
}
--
To unsubscribe, e-mail: <mailto:tomcat-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@;jakarta.apache.org>
