remm 01/11/19 21:06:35
Modified: catalina/src/share/org/apache/catalina/loader Tag:
tomcat_40_branch WebappClassLoader.java
Log:
- After (late) review by Glenn, it turns out that the permission checks are not
needed, and would be bad in some ways since that would force running
Catalina with AllPermissions (which isn't required).
Thanks to Glenn for the help.
Revision Changes Path
No revision
No revision
1.15.2.8 +4 -29
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
Index: WebappClassLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
retrieving revision 1.15.2.7
retrieving revision 1.15.2.8
diff -u -r1.15.2.7 -r1.15.2.8
--- WebappClassLoader.java 2001/11/03 02:27:32 1.15.2.7
+++ WebappClassLoader.java 2001/11/20 05:06:34 1.15.2.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
1.15.2.7 2001/11/03 02:27:32 remm Exp $
- * $Revision: 1.15.2.7 $
- * $Date: 2001/11/03 02:27:32 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
1.15.2.8 2001/11/20 05:06:34 remm Exp $
+ * $Revision: 1.15.2.8 $
+ * $Date: 2001/11/20 05:06:34 $
*
* ====================================================================
*
@@ -122,7 +122,7 @@
*
* @author Remy Maucherat
* @author Craig R. McClanahan
- * @version $Revision: 1.15.2.7 $ $Date: 2001/11/03 02:27:32 $
+ * @version $Revision: 1.15.2.8 $ $Date: 2001/11/20 05:06:34 $
*/
public class WebappClassLoader
extends URLClassLoader
@@ -365,9 +365,6 @@
*/
public void setDebug(int debug) {
- if (securityManager != null)
- securityManager.checkPermission(allPermission);
-
this.debug = debug;
}
@@ -390,9 +387,6 @@
*/
public void setDelegate(boolean delegate) {
- if (securityManager != null)
- securityManager.checkPermission(allPermission);
-
this.delegate = delegate;
}
@@ -406,7 +400,6 @@
*/
public void setPermissions(String path) {
if (securityManager != null) {
- securityManager.checkPermission(allPermission);
if( path.startsWith("jndi:") || path.startsWith("jar:jndi:") ) {
permissionList.add(new JndiPermission(path + "*"));
} else {
@@ -442,9 +435,6 @@
*/
public void setJarPath(String jarPath) {
- if (securityManager != null)
- securityManager.checkPermission(allPermission);
-
this.jarPath = jarPath;
}
@@ -465,9 +455,6 @@
*/
public void addRepository(String repository) {
- if (securityManager != null)
- securityManager.checkPermission(allPermission);
-
// Ignore any of the standard repositories, as they are set up using
// either addJar or addRepository
if (repository.startsWith("/WEB-INF/lib")
@@ -497,9 +484,6 @@
*/
synchronized void addRepository(String repository, File file) {
- if (securityManager != null)
- securityManager.checkPermission(allPermission);
-
// Note : There should be only one (of course), but I think we should
// keep this a bit generic
@@ -533,9 +517,6 @@
synchronized void addJar(String jar, JarFile jarFile, File file)
throws IOException {
- if (securityManager != null)
- securityManager.checkPermission(allPermission);
-
if (jar == null)
return;
if (jarFile == null)
@@ -1436,9 +1417,6 @@
*/
public void start() throws LifecycleException {
- if (securityManager != null)
- securityManager.checkPermission(allPermission);
-
started = true;
}
@@ -1450,9 +1428,6 @@
* @exception LifecycleException if a lifecycle error occurs
*/
public void stop() throws LifecycleException {
-
- if (securityManager != null)
- securityManager.checkPermission(allPermission);
started = false;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
