Author: markt
Date: Sun Jan 28 07:28:23 2007
New Revision: 500812
URL: http://svn.apache.org/viewvc?view=rev&rev=500812
Log:
Simplify code since ServletException now uses standard exception chaining.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java?view=diff&rev=500812&r1=500811&r2=500812
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java Sun
Jan 28 07:28:23 2007
@@ -709,9 +709,7 @@
return theException;
}
- if (theRootCause instanceof ServletException) {
- deeperRootCause = ((ServletException) theRootCause).getRootCause();
- } else if (jspExceptionClazz!=null &&
+ if (jspExceptionClazz!=null &&
jspExceptionClazz.isAssignableFrom(theRootCause.getClass())) {
deeperRootCause = (Throwable)IntrospectionUtils.getProperty(
theRootCause, "rootCause");
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?view=diff&rev=500812&r1=500811&r2=500812
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
Sun Jan 28 07:28:23 2007
@@ -241,10 +241,7 @@
sb.append("</pre></p>");
// In case root cause is somehow heavily nested
try {
- if (rootCause instanceof ServletException) {
- nestedRootCause =
- ((ServletException) rootCause).getRootCause();
- } else if (jspExceptionClazz!=null &&
+ if (jspExceptionClazz!=null &&
jspExceptionClazz.isAssignableFrom(
rootCause.getClass())) {
nestedRootCause = (Throwable)IntrospectionUtils.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
