Author: kostat
Date: 2006-01-18 11:29:08 -0500 (Wed, 18 Jan 2006)
New Revision: 55734
Modified:
trunk/mcs/class/System.Web/System.Web.SessionState/ChangeLog
trunk/mcs/class/System.Web/System.Web.SessionState/HttpSessionState.jvm.cs
Log:
correcting serialization conditions
Modified: trunk/mcs/class/System.Web/System.Web.SessionState/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.SessionState/ChangeLog
2006-01-18 16:12:40 UTC (rev 55733)
+++ trunk/mcs/class/System.Web/System.Web.SessionState/ChangeLog
2006-01-18 16:29:08 UTC (rev 55734)
@@ -1,3 +1,7 @@
+2006-01-18 Konstantin Triger <[EMAIL PROTECTED]>
+
+ * HttpSessionState.jvm.cs: correcting serialization conditions.
+
2006-01-09 Konstantin Triger <[EMAIL PROTECTED]>
* HttpSessionState.jvm.cs: merging HttpSessionState.cs@@/main/19-24
Modified:
trunk/mcs/class/System.Web/System.Web.SessionState/HttpSessionState.jvm.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.SessionState/HttpSessionState.jvm.cs
2006-01-18 16:12:40 UTC (rev 55733)
+++ trunk/mcs/class/System.Web/System.Web.SessionState/HttpSessionState.jvm.cs
2006-01-18 16:29:08 UTC (rev 55734)
@@ -55,9 +55,7 @@
internal bool _abandoned;
private object _app;
- private bool _readFirstTime = true;
private bool _needSessionPersistence = false;
- private const bool HAS_CONTENT_TO_SERIALIZE = true;
internal HttpSessionState (string id,
SessionDictionary dict,
@@ -112,13 +110,9 @@
{
output.writeBoolean(_needSessionPersistence);
if (!_needSessionPersistence)
- {
//indicates that there is nothing to serialize
for this object
- output.writeBoolean(!HAS_CONTENT_TO_SERIALIZE);
return;
- }
- //indicates that there is a content for serialization
- output.writeBoolean(HAS_CONTENT_TO_SERIALIZE);
+
System.Web.J2EE.ObjectOutputStream ms = new
System.Web.J2EE.ObjectOutputStream(output);
System.IO.BinaryWriter bw = new
System.IO.BinaryWriter(ms);
bw.Write(_id);
@@ -143,14 +137,10 @@
{
lock(this)
{
- if(input.readBoolean() != HAS_CONTENT_TO_SERIALIZE)
//noting has been written
+ _needSessionPersistence = input.readBoolean();
+ if(!_needSessionPersistence) //noting has been written
return;
- if (!_readFirstTime) {
- return;
- }
-
- _readFirstTime = false;
System.Web.J2EE.ObjectInputStream ms = new
System.Web.J2EE.ObjectInputStream( input );
System.IO.BinaryReader br = new
System.IO.BinaryReader(ms);
_id = br.ReadString();
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches