tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader StandardClassLoader.java
Date Wed, 05 Feb 2003 22:44:52 GMT
costin      2003/02/05 14:44:52

  Modified:    catalina/src/share/org/apache/catalina/loader Tag:
                        tomcat_40_branch StandardClassLoader.java
  Log:
  Apply classloader fix to branch.
  Original comment:
  
  While most JDK's on Windows are very tolerant of backslashes in file:
  URLs, they are not consisent in exactly WHEN they make the transition
  to spec compliant URLs.  In this case, the url was constructed in
  org.apache.catalina.startup.ClassLoaderFactory.createClassLoader using
  File.separator and extracted using toString().
  
  Submitted by: rubys@apache.org
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.24.2.2  +7 -6      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java
  
  Index: StandardClassLoader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java,v
  retrieving revision 1.24.2.1
  retrieving revision 1.24.2.2
  diff -u -r1.24.2.1 -r1.24.2.2
  --- StandardClassLoader.java	16 Nov 2001 01:21:51 -0000	1.24.2.1
  +++ StandardClassLoader.java	5 Feb 2003 22:44:52 -0000	1.24.2.2
  @@ -693,7 +693,7 @@
   
           // Re-locate the class ourselves to track modifications if possible
           for (int i = 0; i < repositories.length; i++) {
  -            if (!repositories[i].endsWith("/"))
  +            if (!repositories[i].endsWith("/"))                
                   continue;
               String pathname =
                   repositories[i].substring(0, repositories[i].length() - 1);
  @@ -1197,7 +1197,8 @@
               streamHandler = factory.createURLStreamHandler(protocol);
   
           // Validate the manifest of a JAR file repository
  -        if (!repository.endsWith(File.separator)) {
  +        if (!repository.endsWith(File.separator) &&
  +            !repository.endsWith(File.separator)) {
               try {
                   JarFile jarFile = null;
                   Manifest manifest = null;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message