diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2009-01-30 14:14:22 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2009-01-30 14:14:22 +0300 |
| commit | 015ecae5f8d4de3b70eae7402b46f74924576dac (patch) | |
| tree | 0c9fa505bb086249d154c58f01d6d5745c87f3e3 /mcs/class/System.XML/System.Xml.Schema | |
| parent | 4c6adc47ba086520f89394e26175b59d726375d9 (diff) | |
2009-01-30 Atsushi Enomoto <atsushi@ximian.com>
* XmlSchemaValidator.cs : when xsi:nil is true, do not validate
text string. Fixed bug #469713.
* XsdValidatingReader.cs : when xsi:nil is true, do not validate
text string.
* XmlSchemaValidatorTests.cs : added test for bug #469713.
svn path=/trunk/mcs/; revision=125069
Diffstat (limited to 'mcs/class/System.XML/System.Xml.Schema')
| -rw-r--r-- | mcs/class/System.XML/System.Xml.Schema/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidator.cs | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mcs/class/System.XML/System.Xml.Schema/ChangeLog b/mcs/class/System.XML/System.Xml.Schema/ChangeLog index 0250b26800e..ecd3cecd450 100644 --- a/mcs/class/System.XML/System.Xml.Schema/ChangeLog +++ b/mcs/class/System.XML/System.Xml.Schema/ChangeLog @@ -1,5 +1,10 @@ 2009-01-30 Atsushi Enomoto <atsushi@ximian.com> + * XmlSchemaValidator.cs : when xsi:nil is true, do not validate + text string. Fixed bug #469713. + +2009-01-30 Atsushi Enomoto <atsushi@ximian.com> + * XmlSchemaElement.cs : to reference elementFormDefault, use its ancestor, not the schema island root. diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidator.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidator.cs index 390808f2cb0..4c725b08709 100644 --- a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidator.cs +++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidator.cs @@ -437,7 +437,8 @@ namespace System.Xml.Schema if (xsiType != null) HandleXsiType (xsiType); - shouldValidateCharacters = true; + if (xsiNilDepth < depth) + shouldValidateCharacters = true; if (info != null) { info.IsNil = xsiNilDepth >= 0; |