Author: atsushi
Date: 2005-05-02 01:57:08 -0400 (Mon, 02 May 2005)
New Revision: 43862

Modified:
   trunk/mcs/class/System.Data/System.Data/ChangeLog
   trunk/mcs/class/System.Data/System.Data/XmlSchemaDataImporter.cs
Log:
2005-05-02  Atsushi Enomoto  <[EMAIL PROTECTED]>

        * XmlSchemaDataImporter.cs : XmlSchemaParicle might be XmlSchemaAny.
          This fixes bug #74784.



Modified: trunk/mcs/class/System.Data/System.Data/ChangeLog
===================================================================
--- trunk/mcs/class/System.Data/System.Data/ChangeLog   2005-05-02 04:56:25 UTC 
(rev 43861)
+++ trunk/mcs/class/System.Data/System.Data/ChangeLog   2005-05-02 05:57:08 UTC 
(rev 43862)
@@ -1,3 +1,8 @@
+2005-05-02  Atsushi Enomoto  <[EMAIL PROTECTED]>
+
+       * XmlSchemaDataImporter.cs : XmlSchemaParicle might be XmlSchemaAny.
+         This fixes bug #74784.
+
 2005-04-29  Sureshkumar T  <[EMAIL PROTECTED]>
 
        * DataTableReader.cs: removed use of _first. throw if given index

Modified: trunk/mcs/class/System.Data/System.Data/XmlSchemaDataImporter.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data/XmlSchemaDataImporter.cs    
2005-05-02 04:56:25 UTC (rev 43861)
+++ trunk/mcs/class/System.Data/System.Data/XmlSchemaDataImporter.cs    
2005-05-02 05:57:08 UTC (rev 43862)
@@ -561,8 +561,9 @@
                                XmlSchemaElement el = p as XmlSchemaElement;
                                if (el != null)
                                        ImportColumnElement (parent, el);
-                               else
+                               else if (p is XmlSchemaGroupBase)
                                        ImportColumnGroupBase (parent, 
(XmlSchemaGroupBase) p);
+                               // otherwise p is xs:any
                        }
                }
 

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

Reply via email to