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 Thu, 11 Oct 2001 20:59:55 GMT
remm        01/10/11 13:59:55

  Modified:    catalina/src/share/org/apache/catalina/loader
                        WebappClassLoader.java
  Log:
  - No need to use openStream here, as the content is always cached. That
    saves some problems with a security manager when loading resource bundles,
    without using a privileged action.
  
  Revision  Changes    Path
  1.21      +7 -10     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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- WebappClassLoader.java	2001/10/04 18:23:28	1.20
  +++ WebappClassLoader.java	2001/10/11 20:59:55	1.21
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
1.20 2001/10/04 18:23:28 remm Exp $
  - * $Revision: 1.20 $
  - * $Date: 2001/10/04 18:23:28 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
1.21 2001/10/11 20:59:55 remm Exp $
  + * $Revision: 1.21 $
  + * $Date: 2001/10/11 20:59:55 $
    *
    * ====================================================================
    *
  @@ -124,7 +124,7 @@
    *
    * @author Remy Maucherat
    * @author Craig R. McClanahan
  - * @version $Revision: 1.20 $ $Date: 2001/10/04 18:23:28 $
  + * @version $Revision: 1.21 $ $Date: 2001/10/11 20:59:55 $
    */
   public class WebappClassLoader
       extends URLClassLoader
  @@ -1113,12 +1113,9 @@
               // FIXME - cache???
               if (debug >= 2)
                   log("  --> Returning stream from local");
  -            try {
  -               return (url.openStream());
  -            } catch (IOException e) {
  -               log("url.openStream(" + url.toString() + ")", e);
  -               return (null);
  -            }
  +            stream = findLoadedResource(name);
  +            if (stream != null)
  +                return (stream);
           }
   
           // (3) Delegate to parent unconditionally
  
  
  

Mime
View raw message