From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 9 Nov 2009 15:04:07 +0000 (+0000)
Subject: With rev.834080 WebappClassLoader#findResourceInternal(String,String) is always calle... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=dfb3c83b0d4aa3172ff99fca5e9ba97304b6f08f;p=tomcat7.0

With rev.834080 WebappClassLoader#findResourceInternal(String,String) is always called with AccessController.doPrivileged(), thus there is no need to wrap #findResourceInternal(File,String) call that is inside it.

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

diff --git a/java/org/apache/catalina/loader/WebappClassLoader.java b/java/org/apache/catalina/loader/WebappClassLoader.java
index c8d76dec6..71207ddb5 100644
--- a/java/org/apache/catalina/loader/WebappClassLoader.java
+++ b/java/org/apache/catalina/loader/WebappClassLoader.java
@@ -1989,8 +1989,7 @@ public class WebappClassLoader
     }
 
     /**
-     * Find specified resource in local repositories. This block
-     * will execute under an AccessControl.doPrivilege block.
+     * Find specified resource in local repositories.
      *
      * @return the loaded resource, or null if the resource isn't found
      */
@@ -2049,13 +2048,7 @@ public class WebappClassLoader
 
                 // Note : Not getting an exception here means the resource was
                 // found
-                 if (securityManager != null) {
-                    PrivilegedAction<ResourceEntry> dp =
-                        new PrivilegedFindResource(files[i], path);
-                    entry = AccessController.doPrivileged(dp);
-                 } else {
-                    entry = findResourceInternal(files[i], path);
-                 }
+                entry = findResourceInternal(files[i], path);
 
                 ResourceAttributes attributes =
                     (ResourceAttributes) resources.getAttributes(fullPath);