2010-06-01 Atsushi Enomoto <atsushi@ximian.com>

	* SerializationMap.cs : for IXmlSerializable it uses CreateInstance()
	  instead of GetUninitializedObject(). Fixed bug #601785.

svn path=/trunk/mcs/; revision=158251

diff --git a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/ChangeLog b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/ChangeLog
index b6488a4850201aebaa755701f15dce890284573b..59255b44e926be5d94ac33bc77adcf95a5f223db 100755 (executable)
--- a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/ChangeLog
+++ b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-01  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * SerializationMap.cs : for IXmlSerializable it uses CreateInstance()
+         instead of GetUninitializedObject(). Fixed bug #601785.
+
 2010-05-31  Atsushi Enomoto  <atsushi@ximian.com>
 
        * SerializationMap.cs, XmlFormatterSerializer.cs,

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 a8d3c3fcbf10dc77625efee0457bd9e27aca5597..afcd3ebed555cc320993451741f7a596fdf50e42 100644 (file)
--- a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/SerializationMap.cs
+++ b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/SerializationMap.cs
@@ -473,7 +473,7 @@ namespace System.Runtime.Serialization
 
                public override object DeserializeObject (XmlReader reader, XmlFormatterDeserializer deserializer)
                {
-                       IXmlSerializable ixs = (IXmlSerializable) FormatterServices.GetUninitializedObject (RuntimeType);
+                       IXmlSerializable ixs = (IXmlSerializable) Activator.CreateInstance (RuntimeType, new object [0]);
                        ixs.ReadXml (reader);
                        return ixs;
                }