tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader WebappClassLoader.java
Date Tue, 20 Nov 2001 03:33:07 GMT
remm        01/11/19 19:33:07

  Modified:    catalina/src/share/org/apache/catalina/loader
                        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
  1.29      +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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- WebappClassLoader.java	2001/11/15 02:20:32	1.28
  +++ WebappClassLoader.java	2001/11/20 03:33:07	1.29
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
1.28 2001/11/15 02:20:32 remm Exp $
  - * $Revision: 1.28 $
  - * $Date: 2001/11/15 02:20:32 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
1.29 2001/11/20 03:33:07 remm Exp $
  + * $Revision: 1.29 $
  + * $Date: 2001/11/20 03:33:07 $
    *
    * ====================================================================
    *
  @@ -122,7 +122,7 @@
    *
    * @author Remy Maucherat
    * @author Craig R. McClanahan
  - * @version $Revision: 1.28 $ $Date: 2001/11/15 02:20:32 $
  + * @version $Revision: 1.29 $ $Date: 2001/11/20 03:33:07 $
    */
   public class WebappClassLoader
       extends URLClassLoader
  @@ -371,9 +371,6 @@
        */
       public void setDebug(int debug) {
   
  -        if (securityManager != null)
  -            securityManager.checkPermission(allPermission);
  -
           this.debug = debug;
   
       }
  @@ -396,9 +393,6 @@
        */
       public void setDelegate(boolean delegate) {
   
  -        if (securityManager != null)
  -            securityManager.checkPermission(allPermission);
  -
           this.delegate = delegate;
   
       }
  @@ -441,7 +435,6 @@
        */
       public void addPermission(Permission permission) {
           if ((securityManager != null) && (permission != null)) {
  -            securityManager.checkPermission(allPermission);
               permissionList.add(permission);
           }
       }
  @@ -462,9 +455,6 @@
        */
       public void setJarPath(String jarPath) {
   
  -        if (securityManager != null)
  -            securityManager.checkPermission(allPermission);
  -
           this.jarPath = jarPath;
   
       }
  @@ -485,9 +475,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")
  @@ -518,9 +505,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
   
  @@ -554,9 +538,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)
  @@ -1470,9 +1451,6 @@
        */
       public void start() throws LifecycleException {
   
  -        if (securityManager != null)
  -            securityManager.checkPermission(allPermission);
  -
           started = true;
   
       }
  @@ -1484,9 +1462,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:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message