From f6db29bd36b75566aedf78309b2e633daae61e27 Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Thu, 23 Jul 2009 20:02:43 +0000 Subject: [PATCH] 2009-07-23 Sebastien Pouliot * SerializationMap.cs : Ensure Dictionary is still deserialized correctly (wrt previous change). Fix moonlight isolated storage settings. svn path=/trunk/mcs/; revision=138587 --- .../System.Runtime.Serialization/ChangeLog | 6 ++++++ .../System.Runtime.Serialization/SerializationMap.cs | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/ChangeLog b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/ChangeLog index 757ba3a044c..e610330eaa1 100755 --- a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/ChangeLog +++ b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/ChangeLog @@ -1,3 +1,9 @@ +2009-07-23 Sebastien Pouliot + + * SerializationMap.cs : Ensure Dictionary is still deserialized + correctly (wrt previous change). Fix moonlight isolated storage + settings. + 2009-07-22 Atsushi Enomoto * SerializationMap.cs : for empty element, do not try to consume diff --git a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/SerializationMap.cs b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/SerializationMap.cs index 34065a59fcd..4fd43a7dac0 100644 --- a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/SerializationMap.cs +++ b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/SerializationMap.cs @@ -885,6 +885,11 @@ namespace System.Runtime.Serialization #endif } + public override object DeserializeEmptyContent (XmlReader reader, XmlFormatterDeserializer deserializer) + { + return DeserializeContent (reader, deserializer); + } + public override object DeserializeContent(XmlReader reader, XmlFormatterDeserializer deserializer) { object instance = CreateInstance (); -- 2.11.4.GIT