diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2008-06-13 09:37:59 +0400 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2008-06-13 09:37:59 +0400 |
| commit | b0e6ab741642bd027266de74066db9a453230f4f (patch) | |
| tree | 5a19a605a0f8522620a550dca4d415fa81bd9b0f /mcs/class/System.XML/System.Xml.Schema | |
| parent | 685ac2df10433fcdfeed59f9128fb17caa002f79 (diff) | |
2008-06-13 Atsushi Enomoto <atsushi@ximian.com>
* XmlSchema.cs : fixed couple of olive regressions caused by
previous ProcessExternal() patches.
svn path=/trunk/mcs/; revision=105755
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/XmlSchema.cs | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/mcs/class/System.XML/System.Xml.Schema/ChangeLog b/mcs/class/System.XML/System.Xml.Schema/ChangeLog index 43418113e6c..a3604e2fb8f 100644 --- a/mcs/class/System.XML/System.Xml.Schema/ChangeLog +++ b/mcs/class/System.XML/System.Xml.Schema/ChangeLog @@ -1,3 +1,8 @@ +2008-06-13 Atsushi Enomoto <atsushi@ximian.com> + + * XmlSchema.cs : fixed couple of olive regressions caused by + previous ProcessExternal() patches. + 2008-06-06 Atsushi Enomoto <atsushi@ximian.com> * XmlSchema.cs : indent (I slightly modified the previous patch diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs index 36918312f74..277b37688fb 100644 --- a/mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs +++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs @@ -562,7 +562,7 @@ namespace System.Xml.Schema // handle case where target namespace doesn't exist in schema collection - i.e can't find it at all if (includedSchema == null) return; - } else { + } else if (includedSchema != null) { if (TargetNamespace == includedSchema.TargetNamespace) { error (handler, "Target namespace must be different from that of included schema."); return; @@ -571,7 +571,7 @@ namespace System.Xml.Schema return; } } - } else { + } else if (includedSchema != null) { if (TargetNamespace == null && includedSchema.TargetNamespace != null) { error (handler, "Target namespace is required to include a schema which has its own target namespace"); @@ -583,8 +583,8 @@ namespace System.Xml.Schema } // Do not compile included schema here. - - AddExternalComponentsTo (includedSchema, compilationItems, handler, handledUris, resolver, col); + if (includedSchema != null) + AddExternalComponentsTo (includedSchema, compilationItems, handler, handledUris, resolver, col); } |