321307 HashSessionManager calls passivation listeners

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2206 7e9141cc-0065-0410-87d8-b60c137991c4

VERSION.txt

@@ -9,6 +9,8 @@ jetty-7.2-SNAPSHOT
  + 320264 Removed duplicate mime.property entries
  + 320457 Added rfc2045 support to B64Code
  + 321232 BasicAuthenticator ignores bad Authorization header. 
+ + 321307 HashSessionManager calls passivation listeners.
+ 
  + JETTY-912 added per exchange timeout api
  + JETTY-1245 Do not use direct buffers with NIO SSL
  + JETTY-1249 Apply max idle time to all connectors

jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionManager.java

@@ -607,10 +607,6 @@ public abstract class AbstractSessionManager extends AbstractLifeCycle implement
                     ((HttpSessionListener)LazyList.get(_sessionListeners,i)).sessionCreated(event);
             }
         }
-        else
-        {
-            session.didActivate();
-        }
     }
 
     /* ------------------------------------------------------------ */
@@ -701,11 +697,6 @@ public abstract class AbstractSessionManager extends AbstractLifeCycle implement
                 for (int i=LazyList.size(_sessionListeners); i-->0;)
                     ((HttpSessionListener)LazyList.get(_sessionListeners,i)).sessionDestroyed(event);
             }
-            
-            if (!invalidate)
-            {
-                session.willPassivate();
-            }
         }
     }
 

jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java

@@ -94,8 +94,7 @@ public class HashSessionManager extends AbstractSessionManager
      */
     @Override
     public void doStop() throws Exception
-    {
-        
+    {     
         if (_storeDir != null)
             saveSessions();
         
@@ -397,11 +396,13 @@ public class HashSessionManager extends AbstractSessionManager
         _lazyLoad = lazyLoad;
     }
     
+    /* ------------------------------------------------------------ */
     public boolean isLazyLoad()
     {
         return _lazyLoad;
     }
-    
+
+    /* ------------------------------------------------------------ */
     public void restoreSessions () throws Exception
     {
         if (_storeDir==null || !_storeDir.exists())
@@ -424,6 +425,7 @@ public class HashSessionManager extends AbstractSessionManager
                 Session session = restoreSession(in);
                 in.close();          
                 addSession(session, false);
+                session.didActivate();
                 files[i].delete();
             }
             catch (Exception e)
@@ -464,7 +466,9 @@ public class HashSessionManager extends AbstractSessionManager
                         file.delete();
                     file.createNewFile();
                     FileOutputStream fos = new FileOutputStream (file);
+                    session.willPassivate();
                     session.save(fos);
+                        session.didActivate();
                     fos.close();
                 }
                 catch (Exception e)