jfarcand 2003/03/20 12:06:38
Modified: catalina/src/share/org/apache/catalina/core
ApplicationContextFacade.java
Log:
Throw the original exception, not a RuntimeException.
Fix for bug: 18199
Revision Changes Path
1.4 +12 -24
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java
Index: ApplicationContextFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApplicationContextFacade.java 11 Mar 2003 19:39:06 -0000 1.3
+++ ApplicationContextFacade.java 20 Mar 2003 20:06:37 -0000 1.4
@@ -326,20 +326,14 @@
}
return executeMethod(method,appContext,params);
- } catch (Throwable ex){
- Throwable exception;
+ } catch (Exception ex){
if (ex instanceof InvocationTargetException){
- exception = ((InvocationTargetException)ex).getTargetException();
+ return ((InvocationTargetException)ex).getTargetException();
} else if (ex instanceof PrivilegedActionException){
- exception = ((PrivilegedActionException)ex).getException();
+ return ((PrivilegedActionException)ex).getException();
} else {
- exception = ex;
+ return ex;
}
-
- if (log.isErrorEnabled()){
- log.error("doPrivileged", exception);
- }
- throw new RuntimeException(ex.getMessage());
}
}
@@ -358,20 +352,14 @@
Method method = context.getClass()
.getMethod(methodName, (Class[])clazz);
return executeMethod(method,context,params);
- } catch (Throwable ex){
- Throwable exception;
+ } catch (Exception ex){
if (ex instanceof InvocationTargetException){
- exception = ((InvocationTargetException)ex).getTargetException();
+ return ((InvocationTargetException)ex).getTargetException();
} else if (ex instanceof PrivilegedActionException){
- exception = ((PrivilegedActionException)ex).getException();
+ return ((PrivilegedActionException)ex).getException();
} else {
- exception = ex;
+ return ex;
}
-
- if (log.isErrorEnabled()){
- log.error("doPrivileged", exception);
- }
- throw new RuntimeException(ex.getMessage());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]