2005-08-06 Lluis Sanchez Gual <lluis@novell.com>

	* XmlTypeMapping.cs: Added null check.

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

diff --git a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
index 898ba6480b054ccbcfa3fe357600c4bbc5d01fe0..56374a2e60b830846516dce95079a652c357d2ea 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
+++ b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-06  Lluis Sanchez Gual  <lluis@novell.com>
+
+       * XmlTypeMapping.cs: Added null check.
+
 2005-08-05  Lluis Sanchez Gual  <lluis@novell.com>
 
        * XmlTypeMapping.cs: Added ListMembers property that returns

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapping.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapping.cs
index a3c6d82dd79d619f79dbf9aecab741a91f8a477a..8c9f8043f0235ccc69888dbed9e62316f3d2c427 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapping.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapping.cs
@@ -283,7 +283,7 @@ namespace System.Xml.Serialization
                                _elements.Add (key, elem);\r
                        }
                        
-                       if (member.TypeData.IsListType && !member.TypeData.Type.IsArray) {
+                       if (member.TypeData.IsListType && member.TypeData.Type != null && !member.TypeData.Type.IsArray) {
                                if (_listMembers == null) _listMembers = new ArrayList ();\r
                                _listMembers.Add (member);\r
                        }\r