diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2004-09-03 14:03:15 +0400 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2004-09-03 14:03:15 +0400 |
| commit | 56323a4669bd26f74b4408286a449f73498afc38 (patch) | |
| tree | 723f31171d393e89d38fc7be4fea7af5a61cabb7 /mcs/class | |
| parent | a82f835bf05fe86edd3be2a46e85e12f14960796 (diff) | |
2004-09-03 Atsushi Enomoto <atsushi@ximian.com>
* XmlSchema.cs : When schema inclusion results in a recursion, just
skip recursed schema.
svn path=/branches/mono-1-0/mcs/; revision=33259
Diffstat (limited to 'mcs/class')
| -rwxr-xr-x | mcs/class/System.XML/System.Xml.Schema/ChangeLog | 5 | ||||
| -rwxr-xr-x | mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/mcs/class/System.XML/System.Xml.Schema/ChangeLog b/mcs/class/System.XML/System.Xml.Schema/ChangeLog index 14dd692e892..c16cf1a9f1f 100755 --- a/mcs/class/System.XML/System.Xml.Schema/ChangeLog +++ b/mcs/class/System.XML/System.Xml.Schema/ChangeLog @@ -1,3 +1,8 @@ +2004-09-03 Atsushi Enomoto <atsushi@ximian.com> + + * XmlSchema.cs : When schema inclusion results in a recursion, just + skip recursed schema. + 2004-06-18 Atsushi Enomoto <atsushi@ximian.com> * CustomSerializer.cs, XmlSchemaException.cs, diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs index 59e28520089..6e37d9f3be6 100755 --- a/mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs +++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs @@ -369,7 +369,10 @@ namespace System.Xml.Schema if (resolver != null) {
url = GetResolvedUri (resolver, ext.SchemaLocation);
if (schemaLocationStack.Contains (url)) {
- error(handler, "Nested inclusion was found: " + url);
+ // Just skip nested inclusion.
+ // The spec is "carefully written"
+ // not to handle it as an error.
+ // error (handler, "Nested inclusion was found: " + url);
// must skip this inclusion
continue;
}
|