diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2008-03-21 15:11:42 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2008-03-21 15:11:42 +0300 |
| commit | 8f7afecbe159eeb1c96579c09a5b74543133aca3 (patch) | |
| tree | ac1c0ab88d2ea28db2f4620ef396d0d301684a01 /mcs/class/System.XML/System.Xml.Serialization | |
| parent | c8b85d4810015dad1596042b33491f34f3d5e73c (diff) | |
2008-03-21 Atsushi Enomoto <atsushi@ximian.com>
* XmlReflectionImporter.cs : set key for imported type mapping so
that generated serializer does not result in duplicate key error.
Fixed bug #372780.
svn path=/trunk/mcs/; revision=98729
Diffstat (limited to 'mcs/class/System.XML/System.Xml.Serialization')
| -rw-r--r-- | mcs/class/System.XML/System.Xml.Serialization/ChangeLog | 6 | ||||
| -rw-r--r-- | mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog index a4e9e92a9f3..35af3365154 100644 --- a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog +++ b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog @@ -1,3 +1,9 @@ +2008-03-21 Atsushi Enomoto <atsushi@ximian.com> + + * XmlReflectionImporter.cs : set key for imported type mapping so + that generated serializer does not result in duplicate key error. + Fixed bug #372780. + 2008-02-03 Arina Itkes <arinai@mainsoft.com> * XmlSchemaExporter.cs : Generated typed DataTable and typed DataSet diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs index 57160df2c22..a67317b13c6 100644 --- a/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs +++ b/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs @@ -223,6 +223,10 @@ namespace System.Xml.Serialization { default: throw new NotSupportedException ("Type " + typeData.Type.FullName + " not supported for XML stialization"); } +#if NET_2_0 + // bug #372780 + map.SetKey (typeData.Type.ToString ()); +#endif map.RelatedMaps = relatedMaps; map.Format = SerializationFormat.Literal; Type[] extraTypes = includedTypes != null ? (Type[]) includedTypes.ToArray (typeof (Type)) : null; |