diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2008-12-09 14:19:20 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2008-12-09 14:19:20 +0300 |
| commit | 42e6fd4373ae3324f3ce4f645b929d4506b30d68 (patch) | |
| tree | b5d1eb28bdae86f14b26e795dbce28f1c1324b4e /mcs/class/System.XML/System.Xml.Schema | |
| parent | b505253fe7e29b5567a793afe046d0cb45081148 (diff) | |
2008-12-09 Atsushi Enomoto <atsushi@ximian.com>
* XsdValidatingReader.cs : skip text validation under xs:any.
Fixed part of bug #449512.
* XmlSchemaValidator.cs : skip text validation under xs:any.
* XmlValidatingReaderTests.cs : added test for validating mixed
element under xs:any.
svn path=/trunk/mcs/; revision=121093
Diffstat (limited to 'mcs/class/System.XML/System.Xml.Schema')
| -rw-r--r-- | mcs/class/System.XML/System.Xml.Schema/ChangeLog | 4 | ||||
| -rw-r--r-- | mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidator.cs | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/mcs/class/System.XML/System.Xml.Schema/ChangeLog b/mcs/class/System.XML/System.Xml.Schema/ChangeLog index e1e881b0d38..76a53f39bf4 100644 --- a/mcs/class/System.XML/System.Xml.Schema/ChangeLog +++ b/mcs/class/System.XML/System.Xml.Schema/ChangeLog @@ -1,3 +1,7 @@ +2008-12-09 Atsushi Enomoto <atsushi@ximian.com> + + * XmlSchemaValidator.cs : skip text validation under xs:any. + 2008-10-28 Atsushi Enomoto <atsushi@ximian.com> * XmlSchemaValidator.cs : add internal attribute datatype diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidator.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidator.cs index a1d4e9d152f..390808f2cb0 100644 --- a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidator.cs +++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidator.cs @@ -527,6 +527,9 @@ namespace System.Xml.Schema if (schemas.Count == 0) return; + if (skipValidationDepth >= 0 && depth > skipValidationDepth) + return; + ComplexType ct = Context.ActualType as ComplexType; if (ct != null) { switch (ct.ContentType) { |