tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From billbar...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader WebappClassLoader.java
Date Tue, 04 Feb 2003 07:24:22 GMT
billbarker    2003/02/03 23:24:22

  Modified:    catalina/src/share/org/apache/catalina/loader
                        WebappClassLoader.java
  Log:
  Finally regain the ability to build under 1.3.x!!!!!!!!!!!!
  
  Submitted By: Tim Funk funkman@joe.org
  
  Revision  Changes    Path
  1.14      +7 -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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- WebappClassLoader.java	13 Nov 2002 00:36:25 -0000	1.13
  +++ WebappClassLoader.java	4 Feb 2003 07:24:22 -0000	1.14
  @@ -97,6 +97,7 @@
   import javax.naming.NamingEnumeration;
   import javax.naming.NameClassPair;
   
  +import org.apache.tomcat.util.compat.JdkCompat;
   import org.apache.catalina.Lifecycle;
   import org.apache.catalina.LifecycleEvent;
   import org.apache.catalina.LifecycleException;
  @@ -184,6 +185,10 @@
           "javax.servlet.Servlet"                     // Servlet API
       };
   
  +     /** 
  +      * Jdk Compatibility Support.
  +      */
  +     private static JdkCompat jdkCompat = JdkCompat.getJdkCompat();
   
       /**
        * Set of package names which are not allowed to be loaded from a webapp
  @@ -1948,13 +1953,7 @@
       protected URL getURI(File file)
           throws MalformedURLException {
   
  -        File realFile = file;
  -        try {
  -            realFile = realFile.getCanonicalFile();
  -        } catch (IOException e) {
  -            // Ignore
  -        }
  -        return realFile.toURI().toURL();
  +        return jdkCompat.getURI(file);
   
       }
   
  
  
  

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