remm        01/05/11 11:19:53

  Modified:    catalina/src/share/org/apache/catalina/loader
                        StandardClassLoader.java
  Log:
  - The resource existence check was incorrect when using a URL, which
    was breaking reloading in some cases.
  
  Revision  Changes    Path
  1.18      +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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- StandardClassLoader.java  2001/05/04 03:49:56     1.17
  +++ StandardClassLoader.java  2001/05/11 18:19:40     1.18
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java,v
 1.17 2001/05/04 03:49:56 remm Exp $
  - * $Revision: 1.17 $
  - * $Date: 2001/05/04 03:49:56 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java,v
 1.18 2001/05/11 18:19:40 remm Exp $
  + * $Revision: 1.18 $
  + * $Date: 2001/05/11 18:19:40 $
    *
    * ====================================================================
    *
  @@ -110,7 +110,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.17 $ $Date: 2001/05/04 03:49:56 $
  + * @version $Revision: 1.18 $ $Date: 2001/05/11 18:19:40 $
    */
   
   public class StandardClassLoader
  @@ -730,6 +730,9 @@
                       try {
                           URLConnection classUrlConnection =
                               classUrl.openConnection();
  +                        // Check for existence
  +                        InputStream is = classUrlConnection.getInputStream();
  +                        is.close();
                           if (debug >= 4)
                               log("    Caching from '" + classUrl.toString() +
                                   "' modified '" +
  @@ -740,8 +743,6 @@
                               (clazz, classUrl, 
                                classUrlConnection.getLastModified()));
                       } catch (IOException e) {
  -                        log("    Failed tracking modifications of '" 
  -                            + classUrl.toString() + "'");
                       }
                       
                   } catch(MalformedURLException ex) {
  
  
  

Reply via email to