Author: mhabersack
Date: 2007-08-09 04:05:54 -0400 (Thu, 09 Aug 2007)
New Revision: 83715
Modified:
tags/mono-1-2-5/mcs/class/System.Web/System.Web.SessionState_2.0/ChangeLog
tags/mono-1-2-5/mcs/class/System.Web/System.Web.SessionState_2.0/SessionInProcHandler.cs
tags/mono-1-2-5/mcs/class/System.Web/System.Web.SessionState_2.0/SessionStateServerHandler.cs
Log:
Backport of a fix from trunk:
2007-07-31 Marek Habersack <[EMAIL PROTECTED]>
* SessionInProcHandler.cs: initialize the static session objects
collection from the application state instead of using
SessionStateUtility.GetSessionStaticObjects. Fixes bug #82193
* SessionStateServerHandler.cs: as above
Modified:
tags/mono-1-2-5/mcs/class/System.Web/System.Web.SessionState_2.0/ChangeLog
===================================================================
--- tags/mono-1-2-5/mcs/class/System.Web/System.Web.SessionState_2.0/ChangeLog
2007-08-09 08:01:51 UTC (rev 83714)
+++ tags/mono-1-2-5/mcs/class/System.Web/System.Web.SessionState_2.0/ChangeLog
2007-08-09 08:05:54 UTC (rev 83715)
@@ -1,3 +1,10 @@
+2007-07-31 Marek Habersack <[EMAIL PROTECTED]>
+
+ * SessionInProcHandler.cs: initialize the static session objects
+ collection from the application state instead of using
+ SessionStateUtility.GetSessionStaticObjects. Fixes bug #82193
+ * SessionStateServerHandler.cs: as above
+
2007-06-20 Marek Habersack <[EMAIL PROTECTED]>
* SessionInProcHandler.cs: use HttpRuntime.InternalCache to keep
Modified:
tags/mono-1-2-5/mcs/class/System.Web/System.Web.SessionState_2.0/SessionInProcHandler.cs
===================================================================
---
tags/mono-1-2-5/mcs/class/System.Web/System.Web.SessionState_2.0/SessionInProcHandler.cs
2007-08-09 08:01:51 UTC (rev 83714)
+++
tags/mono-1-2-5/mcs/class/System.Web/System.Web.SessionState_2.0/SessionInProcHandler.cs
2007-08-09 08:05:54 UTC (rev 83715)
@@ -77,7 +77,7 @@
public override SessionStateStoreData CreateNewStoreData
(HttpContext context, int timeout)
{
return new SessionStateStoreData (new
SessionStateItemCollection (),
-
SessionStateUtility.GetSessionStaticObjects(context),
+
HttpApplicationFactory.ApplicationState.SessionObjects,
timeout);
}
@@ -156,7 +156,7 @@
item.items = new
SessionStateItemCollection ();
}
return new SessionStateStoreData (item.items,
-
SessionStateUtility.GetSessionStaticObjects(context),
+
HttpApplicationFactory.ApplicationState.SessionObjects,
item.timeout);
} catch {
// we want such errors to be passed to the
application.
@@ -344,7 +344,7 @@
expireCallback (key,
new
SessionStateStoreData (
item.items,
-
SessionStateUtility.GetSessionStaticObjects (HttpContext.Current),
+
HttpApplicationFactory.ApplicationState.SessionObjects,
item.timeout));
} else
expireCallback (key, null);
Modified:
tags/mono-1-2-5/mcs/class/System.Web/System.Web.SessionState_2.0/SessionStateServerHandler.cs
===================================================================
---
tags/mono-1-2-5/mcs/class/System.Web/System.Web.SessionState_2.0/SessionStateServerHandler.cs
2007-08-09 08:01:51 UTC (rev 83714)
+++
tags/mono-1-2-5/mcs/class/System.Web/System.Web.SessionState_2.0/SessionStateServerHandler.cs
2007-08-09 08:05:54 UTC (rev 83715)
@@ -47,7 +47,7 @@
public override SessionStateStoreData CreateNewStoreData
(HttpContext context, int timeout)
{
return new SessionStateStoreData (new
SessionStateItemCollection (),
-
SessionStateUtility.GetSessionStaticObjects(context),
+
HttpApplicationFactory.ApplicationState.SessionObjects,
timeout);
}
@@ -73,9 +73,11 @@
out SessionStateActions
actions,
bool exclusive)
{
+#if TRACE
Console.WriteLine
("SessionStateServerHandler.GetItemInternal");
Console.WriteLine ("\tid == {0}", id);
Console.WriteLine ("\tpath == {0}",
context.Request.FilePath);
+#endif
locked = false;
lockAge = TimeSpan.MinValue;
lockId = Int32.MinValue;
@@ -92,11 +94,15 @@
exclusive);
if (item == null) {
+#if TRACE
Console.WriteLine ("\titem is null (locked ==
{0}, actions == {1})", locked, actions);
+#endif
return null;
}
if (actions == SessionStateActions.InitializeItem) {
+#if TRACE
Console.WriteLine ("\titem needs
initialization");
+#endif
return CreateNewStoreData (context,
item.Timeout);
}
SessionStateItemCollection items = null;
@@ -150,7 +156,9 @@
public override void Initialize (string name,
NameValueCollection config)
{
+#if TRACE
Console.WriteLine
("SessionStateServerHandler.Initialize");
+#endif
if (String.IsNullOrEmpty (name))
name = "Session Server handler";
privateConfig = config;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
