2006-09-12 Lluis Sanchez Gual <lluis@novell.com>

	* System.Xml.Serialization/XmlSchemaImporter.cs: Added null check.

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

diff --git a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
index 014efbc315367e01e377a094c0f84ae9dbb80dd6..cb908a51dbb0a3481fa326bf050c8e7d68488dce 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
+++ b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-12  Lluis Sanchez Gual  <lluis@novell.com> 
+
+       * System.Xml.Serialization/XmlSchemaImporter.cs: Added null check.
+
 2006-09-11  Andrew Skiba <andrews@mainsoft.com>
 
        * XmlSchemaImporter.cs,XmlMemberMapping.cs,SchemaImporter.cs: ifdef

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs
index ce387c69a6ec58cae9fa965c228dcd6d611a6b02..c78dafd59c6f4d3ad3562f6594cd0b59788857f9 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs
@@ -1053,7 +1053,10 @@ namespace System.Xml.Serialization
                                choiceMember.ElementInfo.Add (CreateElementInfo (typeQName.Namespace, choiceMember, choiceMember.Name, choiceMember.TypeData, false, XmlSchemaForm.None));\r
                                cmap.AddMember (choiceMember);\r
                        }\r
-\r
+                       \r
+                       if (typeData == null)\r
+                               return;\r
+       \r
                        if (multiValue)\r
                                typeData = typeData.ListTypeData;\r
 \r