Author: lluis
Date: 2006-09-12 08:01:03 -0400 (Tue, 12 Sep 2006)
New Revision: 65297

Modified:
   trunk/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
   trunk/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs
Log:
2006-09-12  Lluis Sanchez Gual  <[EMAIL PROTECTED]> 

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



Modified: trunk/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/System.Xml.Serialization/ChangeLog       
2006-09-12 11:27:39 UTC (rev 65296)
+++ trunk/mcs/class/System.XML/System.Xml.Serialization/ChangeLog       
2006-09-12 12:01:03 UTC (rev 65297)
@@ -1,3 +1,7 @@
+2006-09-12  Lluis Sanchez Gual  <[EMAIL PROTECTED]> 
+
+       * System.Xml.Serialization/XmlSchemaImporter.cs: Added null check.
+
 2006-09-11  Andrew Skiba <[EMAIL PROTECTED]>
 
        * XmlSchemaImporter.cs,XmlMemberMapping.cs,SchemaImporter.cs: ifdef

Modified: 
trunk/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs    
2006-09-12 11:27:39 UTC (rev 65296)
+++ trunk/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs    
2006-09-12 12:01:03 UTC (rev 65297)
@@ -1053,7 +1053,10 @@
                                choiceMember.ElementInfo.Add (CreateElementInfo 
(typeQName.Namespace, choiceMember, choiceMember.Name, choiceMember.TypeData, 
false, XmlSchemaForm.None));
                                cmap.AddMember (choiceMember);
                        }
-
+                       
+                       if (typeData == null)
+                               return;
+       
                        if (multiValue)
                                typeData = typeData.ListTypeData;
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to