Author: kostat
Date: 2007-05-08 04:40:25 -0400 (Tue, 08 May 2007)
New Revision: 76904

Modified:
   branches/mainsoft/gh20/mcs/class/System/System.Net/WebHeaderCollection.cs
Log:
merge -r76879:76880

Modified: 
branches/mainsoft/gh20/mcs/class/System/System.Net/WebHeaderCollection.cs
===================================================================
--- branches/mainsoft/gh20/mcs/class/System/System.Net/WebHeaderCollection.cs   
2007-05-08 08:22:24 UTC (rev 76903)
+++ branches/mainsoft/gh20/mcs/class/System/System.Net/WebHeaderCollection.cs   
2007-05-08 08:40:25 UTC (rev 76904)
@@ -113,10 +113,20 @@
                protected WebHeaderCollection (SerializationInfo 
serializationInfo, 
                                               StreamingContext 
streamingContext)
                {
-                       int count = serializationInfo.GetInt32("Count");
-                       for (int i = 0; i < count; i++) 
-                               this.Add (serializationInfo.GetString 
(i.ToString ()),
-                                       serializationInfo.GetString ((count + 
i).ToString ()));
+                       int count;
+
+                       try {
+                               count = serializationInfo.GetInt32("Count");
+                               for (int i = 0; i < count; i++) 
+                                       this.Add (serializationInfo.GetString 
(i.ToString ()),
+                                                 serializationInfo.GetString 
((count + i).ToString ()));
+                       } catch (SerializationException){
+                               count = serializationInfo.GetInt32("count");
+                               for (int i = 0; i < count; i++) 
+                                       this.Add (serializationInfo.GetString 
("k" + i),
+                                                 serializationInfo.GetString 
("v" + i));
+                       }
+                       
                }
                
                internal WebHeaderCollection (bool internallyCreated)

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

Reply via email to