tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardContext.java
Date Fri, 24 Dec 2004 16:48:19 GMT
markt       2004/12/24 08:48:19

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardContext.java
  Log:
  Fix bug 32559. Make reload and stop/start more similar in terms
   of ordering although the fundamental difference remains.
  
  Revision  Changes    Path
  1.127     +16 -12    jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.126
  retrieving revision 1.127
  diff -u -r1.126 -r1.127
  --- StandardContext.java	19 Nov 2004 20:52:02 -0000	1.126
  +++ StandardContext.java	24 Dec 2004 16:48:18 -0000	1.127
  @@ -2459,6 +2459,16 @@
           // Binding thread
           ClassLoader oldCCL = bindThread();
   
  +        // Shut down filters
  +        filterStop();
  +
  +        // Clear all application-originated servlet context attributes
  +        if (context != null)
  +            context.clearAttributes();
  +
  +        // Shut down application event listeners
  +        listenerStop();
  +
           // Shut down our session manager
           if ((manager != null) && (manager instanceof Lifecycle)) {
               try {
  @@ -2483,18 +2493,8 @@
               }
           }
   
  -        // Shut down application event listeners
  -        listenerStop();
  -
  -        // Clear all application-originated servlet context attributes
  -        if (context != null)
  -            context.clearAttributes();
  -
  -        // Shut down filters
  -        filterStop();
  -
           if (isUseNaming()) {
  -            // Start
  +            // Stop
               namingContextListener.lifecycleEvent
                   (new LifecycleEvent(this, Lifecycle.STOP_EVENT));
           }
  @@ -3692,6 +3692,10 @@
   
           // Stop our filters
           filterStop();
  +
  +        // Clear all application-originated servlet context attributes
  +        if (context != null)
  +            context.clearAttributes();
   
           // Stop our application listeners
           listenerStop();
  
  
  

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