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 WebappLoader.java
Date Tue, 16 Oct 2001 07:00:42 GMT
remm        01/10/16 00:00:42

  Modified:    catalina/src/share/org/apache/catalina/loader
                        WebappLoader.java
  Log:
  - When I did the class loader cleanup some time ago, I incorrectly removed
    some permissions, which unfortunately went undetected for quite some time.
    Thanks to Patrick Luby for reporting the problems.
  
  Revision  Changes    Path
  1.14      +12 -5     jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- WebappLoader.java	2001/10/10 00:55:10	1.13
  +++ WebappLoader.java	2001/10/16 07:00:42	1.14
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
1.13 2001/10/10 00:55:10 remm Exp $
  - * $Revision: 1.13 $
  - * $Date: 2001/10/10 00:55:10 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
1.14 2001/10/16 07:00:42 remm Exp $
  + * $Revision: 1.14 $
  + * $Date: 2001/10/16 07:00:42 $
    *
    * ====================================================================
    *
  @@ -119,7 +119,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.13 $ $Date: 2001/10/10 00:55:10 $
  + * @version $Revision: 1.14 $ $Date: 2001/10/16 07:00:42 $
    */
   
   public class WebappLoader
  @@ -804,6 +804,14 @@
   
           try {
   
  +            URL rootURL = servletContext.getResource("/");
  +            classLoader.setPermissions(rootURL);
  +
  +            String contextRoot = servletContext.getRealPath("/");
  +            if (contextRoot != null) {
  +                classLoader.setPermissions(contextRoot);
  +            }
  +
               URL classesURL =
                   servletContext.getResource("/WEB-INF/classes/");
               if (classesURL != null)
  @@ -814,7 +822,6 @@
                   classLoader.setPermissions(libURL);
               }
   
  -            String contextRoot = servletContext.getRealPath("/");
               if (contextRoot != null) {
   
                   if (libURL != null) {
  
  
  

Mime
View raw message