tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfcl...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader WebappLoader.java
Date Fri, 22 Mar 2002 17:30:50 GMT
jfclere     02/03/22 09:30:50

  Modified:    catalina/src/share/org/apache/catalina/loader Tag:
                        tomcat_40_branch WebappLoader.java
  Log:
  PR: 6982
  But it is only partial what to do with the Resources in StandardContext?
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.12.2.6  +8 -5      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.12.2.5
  retrieving revision 1.12.2.6
  diff -u -r1.12.2.5 -r1.12.2.6
  --- WebappLoader.java	7 Feb 2002 19:20:35 -0000	1.12.2.5
  +++ WebappLoader.java	22 Mar 2002 17:30:50 -0000	1.12.2.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
1.12.2.5 2002/02/07 19:20:35 remm Exp $
  - * $Revision: 1.12.2.5 $
  - * $Date: 2002/02/07 19:20:35 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
1.12.2.6 2002/03/22 17:30:50 jfclere Exp $
  + * $Revision: 1.12.2.6 $
  + * $Date: 2002/03/22 17:30:50 $
    *
    * ====================================================================
    *
  @@ -119,7 +119,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.12.2.5 $ $Date: 2002/02/07 19:20:35 $
  + * @version $Revision: 1.12.2.6 $ $Date: 2002/03/22 17:30:50 $
    */
   
   public class WebappLoader
  @@ -1266,6 +1266,8 @@
   
               // Wait for our check interval
               threadSleep();
  +            if (!started)
  +                break;
   
               try {
                   // Perform our modification check
  @@ -1277,7 +1279,8 @@
               }
   
               // Handle a need for reloading
  -            notifyContext();
  +            if (!started)
  +                notifyContext();
               break;
   
           }
  
  
  

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