Author: krasnov
Date: 2008-02-12 04:24:34 -0500 (Tue, 12 Feb 2008)
New Revision: 95484
Modified:
trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI/ObjectStateFormatter.cs
Log:
* ObjectStateFormatter.cs: revert of 91820
Modified: trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2008-02-12 09:03:31 UTC
(rev 95483)
+++ trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2008-02-12 09:24:34 UTC
(rev 95484)
@@ -1,3 +1,7 @@
+2008-02-12 Vladimir Krasnov <[EMAIL PROTECTED]>
+
+ * ObjectStateFormatter.cs: revert of 91820
+
2008-02-08 Marek Habersack <[EMAIL PROTECTED]>
* SimpleWebHandlerParser.cs: always return a non-null value from
Modified: trunk/mcs/class/System.Web/System.Web.UI/ObjectStateFormatter.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/ObjectStateFormatter.cs
2008-02-12 09:03:31 UTC (rev 95483)
+++ trunk/mcs/class/System.Web/System.Web.UI/ObjectStateFormatter.cs
2008-02-12 09:24:34 UTC (rev 95484)
@@ -153,10 +153,6 @@
return "";
#endif
byte [] buffer = Convert.FromBase64String (inputString);
- return DeserializeInternal (buffer);
- }
-
- internal object DeserializeInternal(byte [] buffer) {
int length;
if (buffer == null || (length = buffer.Length) == 0)
throw new ArgumentNullException ("inputString");
@@ -177,13 +173,7 @@
{
if (stateGraph == null)
return "";
- int length;
- byte [] buffer = SerializeInternal (stateGraph, out
length);
- return Convert.ToBase64String (buffer, 0, length);
- }
-
- internal byte[] SerializeInternal(object stateGraph, out int
length) {
-
+
MemoryStream ms = new MemoryStream ();
Stream output = ms;
#if NET_2_0
@@ -208,9 +198,7 @@
}
}
-
- length = (int) ms.Length;
- return ms.GetBuffer ();
+ return Convert.ToBase64String (ms.GetBuffer (), 0,
(int) ms.Length);
}
public void Serialize (Stream outputStream, object stateGraph)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
