Author: kostat
Date: 2007-01-01 12:49:03 -0500 (Mon, 01 Jan 2007)
New Revision: 70322

Modified:
   
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.SessionState/ServletSessionStateStoreProvider.cs
Log:
correct working with timeouts

Modified: 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.SessionState/ServletSessionStateStoreProvider.cs
===================================================================
--- 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.SessionState/ServletSessionStateStoreProvider.cs
  2007-01-01 17:45:58 UTC (rev 70321)
+++ 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.SessionState/ServletSessionStateStoreProvider.cs
  2007-01-01 17:49:03 UTC (rev 70322)
@@ -46,13 +46,16 @@
                        actions = SessionStateActions.None;
                        if (id == null)
                                return null;
-                       ServletSessionStateItemCollection sessionState = 
(ServletSessionStateItemCollection) GetWorkerRequest 
(context).ServletRequest.getSession (false).getAttribute 
(J2EEConsts.SESSION_STATE);
+                       HttpSession session = GetWorkerRequest 
(context).ServletRequest.getSession (false);
+                       if (session == null)
+                               return null;
+                       ServletSessionStateItemCollection sessionState = 
(ServletSessionStateItemCollection) session.getAttribute 
(J2EEConsts.SESSION_STATE);
                        if (sessionState == null)
                                return null;
                        return new SessionStateStoreData (
                                sessionState,
                                sessionState.StaticObjects,
-                               10);
+                               session.getMaxInactiveInterval()/60);
                }
 
                public override SessionStateStoreData GetItemExclusive 
(HttpContext context, string id, out bool locked, out TimeSpan lockAge, out 
object lockId, out SessionStateActions actions) {
@@ -74,7 +77,15 @@
                }
 
                public override void SetAndReleaseItemExclusive (HttpContext 
context, string id, SessionStateStoreData item, object lockId, bool newItem) {
-                       GetWorkerRequest (context).ServletRequest.getSession 
(false).setAttribute (J2EEConsts.SESSION_STATE, item.Items);
+                       if (id == null)
+                               return;
+                       HttpSession session = GetWorkerRequest 
(context).ServletRequest.getSession (false);
+                       if (newItem)
+                               session.setMaxInactiveInterval (item.Timeout * 
60);
+                       if (item.Items.Dirty)
+                               session.setAttribute (J2EEConsts.SESSION_STATE, 
item.Items);
+
+                       ReleaseItemExclusive (context, id, lockId);
                }
 
                public override bool SetItemExpireCallback 
(SessionStateItemExpireCallback expireCallback) {

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to