* ServletSessionStateStoreProvider.cs: fixed RemoveItem, uses invalidate

fixed SetItemExpireCallback to avoid Session_OnEnd call from SessionStateModule
* SessionListener.cs: fixed sessionDestroyed to avoid clearing AppDomain on invalidate call

svn path=/trunk/mcs/; revision=72845

diff --git a/mcs/class/Mainsoft.Web/Mainsoft.Web.SessionState/ServletSessionStateStoreProvider.cs b/mcs/class/Mainsoft.Web/Mainsoft.Web.SessionState/ServletSessionStateStoreProvider.cs
index bc20085e4f9984e60293ae253c78d47d27aa8e14..71b4501f51c07611e7d94c4ab83d4d17836e84b1 100755 (executable)
--- a/mcs/class/Mainsoft.Web/Mainsoft.Web.SessionState/ServletSessionStateStoreProvider.cs
+++ b/mcs/class/Mainsoft.Web/Mainsoft.Web.SessionState/ServletSessionStateStoreProvider.cs
@@ -91,7 +91,7 @@ namespace Mainsoft.Web.SessionState
                }\r
 \r
                public override void RemoveItem (HttpContext context, string id, object lockId, SessionStateStoreData item) {\r
-                       GetSession (context, false).setAttribute (J2EEConsts.SESSION_STATE, null);\r
+                       GetSession (context, false).invalidate ();\r
                }\r
 \r
                public override void ResetItemTimeout (HttpContext context, string id) {\r
@@ -109,7 +109,7 @@ namespace Mainsoft.Web.SessionState
                }\r
 \r
                public override bool SetItemExpireCallback (SessionStateItemExpireCallback expireCallback) {\r
-                       return true;\r
+                       return false; //we call session.invalidate so our session listener will call Session_OnEnd\r
                }\r
 \r
                #endregion\r

diff --git a/mcs/class/Mainsoft.Web/Mainsoft.Web.SessionState/SessionListener.cs b/mcs/class/Mainsoft.Web/Mainsoft.Web.SessionState/SessionListener.cs
index 899cea59fc5519ef9f6aa05b7afe8f58e9841fdd..4917d98bef8127615264224bd24b7da03ff3cbb4 100644 (file)
--- a/mcs/class/Mainsoft.Web/Mainsoft.Web.SessionState/SessionListener.cs
+++ b/mcs/class/Mainsoft.Web/Mainsoft.Web.SessionState/SessionListener.cs
@@ -40,8 +40,11 @@ namespace Mainsoft.Web.SessionState
                }
 
                public void sessionDestroyed (HttpSessionEvent se) {
-                       AppDomain servletDomain = (AppDomain) se.getSession ().getServletContext ().getAttribute (J2EEConsts.APP_DOMAIN);
-                       vmw.@internal.EnvironmentUtils.setAppDomain (servletDomain);
+                       bool setDomain = vmw.@internal.EnvironmentUtils.getAppDomain () == null;
+                       if (setDomain) {
+                               AppDomain servletDomain = (AppDomain) se.getSession ().getServletContext ().getAttribute (J2EEConsts.APP_DOMAIN);
+                               vmw.@internal.EnvironmentUtils.setAppDomain (servletDomain);
+                       }
                        try {
                                HttpSessionStateContainer container =
                                        ServletSessionStateStoreProvider.CreateContainer (se.getSession ());
@@ -55,7 +58,8 @@ namespace Mainsoft.Web.SessionState
                        }
 #endif
                        finally {
-                               vmw.@internal.EnvironmentUtils.clearAppDomain ();
+                               if (setDomain)
+                                       vmw.@internal.EnvironmentUtils.clearAppDomain ();
                        }
                }
        }