From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 19 Dec 2008 14:28:06 +0000 (+0000)
Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46408
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=b7932cda8843d82d80d14956e57bb6466a1ee87e;p=tomcat7.0

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46408
Don't make assumptions about exception type

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@728032 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/security/SecurityUtil.java b/java/org/apache/catalina/security/SecurityUtil.java
index 3afbd9218..b046a337c 100644
--- a/java/org/apache/catalina/security/SecurityUtil.java
+++ b/java/org/apache/catalina/security/SecurityUtil.java
@@ -299,9 +299,14 @@ public final class SecurityUtil{
             }
 
             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);