remm        02/02/14 16:02:28

  Modified:    catalina/src/share/org/apache/catalina/loader
                        WebappLoader.java
  Log:
  - Clean the start and stop methods of context.
  - I think it's not doable to take advantage of the inheritance from ContainerBase
    for these two methods, as the StandardContext must take care of the context class 
laoder
    binding (and putting it at the end of Loader.start was a hack), so it's necessary 
to
    interleave method calls.
  - The shutdown order is also modified, and the manager can now notify
    the session listeners if needed.
  
  Revision  Changes    Path
  1.25      +4 -6      
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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- WebappLoader.java 12 Feb 2002 20:43:33 -0000      1.24
  +++ WebappLoader.java 15 Feb 2002 00:02:28 -0000      1.25
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.24 2002/02/12 20:43:33 remm Exp $
  - * $Revision: 1.24 $
  - * $Date: 2002/02/12 20:43:33 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.25 2002/02/15 00:02:28 remm Exp $
  + * $Revision: 1.25 $
  + * $Date: 2002/02/15 00:02:28 $
    *
    * ====================================================================
    *
  @@ -117,7 +117,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.24 $ $Date: 2002/02/12 20:43:33 $
  + * @version $Revision: 1.25 $ $Date: 2002/02/15 00:02:28 $
    */
   
   public class WebappLoader
  @@ -645,8 +645,6 @@
               // Binding the Webapp class loader to the directory context
               DirContextURLStreamHandler.bind
                   ((ClassLoader) classLoader, this.container.getResources());
  -
  -            Thread.currentThread().setContextClassLoader(classLoader);
   
           } catch (Throwable t) {
               throw new LifecycleException("start: ", t);
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to