Author: markt
Date: Fri Dec 19 06:28:06 2008
New Revision: 728032
URL: http://svn.apache.org/viewvc?rev=728032&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46408
Don't make assumptions about exception type
Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java?rev=728032&r1=728031&r2=728032&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java (original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java Fri Dec 19
06:28:06 2008
@@ -299,9 +299,14 @@
}
Subject.doAsPrivileged(subject, pea, null);
- } catch( PrivilegedActionException pe) {
- Throwable e = ((InvocationTargetException)pe.getException())
+ } catch( PrivilegedActionException pe) {
+ Throwable e;
+ if (pe.getException() instanceof InvocationTargetException) {
+ e = ((InvocationTargetException)pe.getException())
.getTargetException();
+ } else {
+ e = pe;
+ }
if (log.isDebugEnabled()){
log.debug(sm.getString("SecurityUtil.doAsPrivilege"), e);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
