Author: kkolinko
Date: Mon Nov 9 15:04:07 2009
New Revision: 834096
URL: http://svn.apache.org/viewvc?rev=834096&view=rev
Log:
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.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=834096&r1=834095&r2=834096&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Mon Nov
9 15:04:07 2009
@@ -1989,8 +1989,7 @@
}
/**
- * 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 @@
// 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);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
