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-catalina/catalina/src/share/org/apache/catalina/loader WebappClassLoader.java
Date Thu, 07 Nov 2002 18:03:10 GMT
remm        2002/11/07 10:03:10

  Modified:    catalina/src/share/org/apache/catalina/loader
                        WebappClassLoader.java
  Log:
  - codeBase is a URL (unencoded).
  - source is a URI (encoded).
  
  Revision  Changes    Path
  1.12      +8 -8      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
  
  Index: WebappClassLoader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- WebappClassLoader.java	7 Nov 2002 17:24:37 -0000	1.11
  +++ WebappClassLoader.java	7 Nov 2002 18:03:10 -0000	1.12
  @@ -1564,7 +1564,7 @@
           ResourceEntry entry = new ResourceEntry();
           try {
               entry.source = getURI(new File(file, path));
  -            entry.codeBase = entry.source;
  +            entry.codeBase = getURL(new File(file, path));
           } catch (MalformedURLException e) {
               return null;
           }   
  @@ -1618,7 +1618,7 @@
                           new PrivilegedFindResource(files[i], path);
                       entry = (ResourceEntry)AccessController.doPrivileged(dp);
                    } else {
  -                    entry = findResourceInternal(files[i], path);                     
  +                    entry = findResourceInternal(files[i], path);
                    }
   
                   ResourceAttributes attributes =
  @@ -1676,8 +1676,8 @@
   
                   entry = new ResourceEntry();
                   try {
  -                    entry.codeBase = getURI(jarRealFiles[i]);
  -                    String jarFakeUrl = entry.codeBase.toString();
  +                    entry.codeBase = getURL(jarRealFiles[i]);
  +                    String jarFakeUrl = getURI(jarRealFiles[i]).toString();
                       jarFakeUrl = "jar:" + jarFakeUrl + "!/" + path;
                       entry.source = new URL(jarFakeUrl);
                   } catch (MalformedURLException e) {
  
  
  

--
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