2006-03-23 Atsushi Enomoto <atsushi@ximian.com>

	* XmlReader.cs : in XmlReader.Create() ValidationType Auto and XDR
	  are simply ignored (it was found on running NvdlValidatingReader
	  under MS.NET 2.0).

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

diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog
index 1386a6aed9dffc822480ec596a4c11bf9487978f..b4f02b212e38c0afc93c2e59a5d81bcbdeec8589 100644 (file)
--- a/mcs/class/System.XML/System.Xml/ChangeLog
+++ b/mcs/class/System.XML/System.Xml/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-23  Atsushi Enomoto <atsushi@ximian.com>
+
+       * XmlReader.cs : in XmlReader.Create() ValidationType Auto and XDR
+         are simply ignored (it was found on running NvdlValidatingReader
+         under MS.NET 2.0).
+
 2006-03-23  Atsushi Enomoto <atsushi@ximian.com>
 
        * DTDValidatingReader.cs : avoid NullReferenceException. Input

diff --git a/mcs/class/System.XML/System.Xml/XmlReader.cs b/mcs/class/System.XML/System.Xml/XmlReader.cs
index 1dfb512593272684249abb480d2858e0add7ea69..80a68b9823cc1cee2f32f9c8141090671b3403b4 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlReader.cs
+++ b/mcs/class/System.XML/System.Xml/XmlReader.cs
@@ -400,7 +400,8 @@ namespace System.Xml
                {
                        XmlValidatingReader xvr = null;
                        switch (settings.ValidationType) {
-                       case ValidationType.None:
+                       // Auto and XDR are obsoleted in 2.0 and therefore ignored.
+                       default:
                                return reader;
                        case ValidationType.DTD:
                                xvr = new XmlValidatingReader (reader);
@@ -411,13 +412,6 @@ namespace System.Xml
 //                             xvr = new XmlValidatingReader (reader);
 //                             xvr.ValidationType = ValidationType.Schema;
                                return new XmlSchemaValidatingReader (reader, settings);
-                       case ValidationType.Auto:
-                               xvr = new XmlValidatingReader (reader);
-                               xvr.ValidationType = ValidationType.DTD;
-                               reader = xvr;
-                               goto case ValidationType.Schema;
-                       case ValidationType.XDR:
-                               throw new NotSupportedException ();
                        }
                        if (xvr != null)
                                xvr.SetSchemas (settings.Schemas);