tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardContext.java
Date Wed, 12 Jan 2005 18:19:54 GMT
remm        2005/01/12 10:19:54

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardContext.java
  Log:
  - Fix session persistence on stop (removing the attributes is ok, but the session manager
needs the work directory on stop).
  
  Revision  Changes    Path
  1.159     +5 -5      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.158
  retrieving revision 1.159
  diff -u -r1.158 -r1.159
  --- StandardContext.java	24 Dec 2004 16:50:00 -0000	1.158
  +++ StandardContext.java	12 Jan 2005 18:19:54 -0000	1.159
  @@ -4254,16 +4254,16 @@
           // Stop our filters
           filterStop();
   
  -        // Clear all application-originated servlet context attributes
  -        if (context != null)
  -            context.clearAttributes();
  -
           // Stop ContainerBackgroundProcessor thread
           super.threadStop();
   
           if ((manager != null) && (manager instanceof Lifecycle)) {
               ((Lifecycle) manager).stop();
           }
  +
  +        // Clear all application-originated servlet context attributes
  +        if (context != null)
  +            context.clearAttributes();
   
           // Finalize our character set mapper
           setCharsetMapper(null);
  
  
  

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