diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2005-09-30 09:46:40 +0400 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2005-09-30 09:46:40 +0400 |
| commit | d13ae687cb7d7f46bf99d23c90f844ff2fd1a817 (patch) | |
| tree | 9b690aba9174a07ed0e093142e6866b3d81beb0f /mcs/class/Commons.Xml.Relaxng | |
| parent | d5feae8969757e1f77c6599ba7f27ec0dc3de229 (diff) | |
2005-09-30 Atsushi Enomoto <atsushi@ximian.com>
* NvdlXsdSupport.cs : related fix to r51030; XmlSchema.Read() now does
not consume EndElement.
svn path=/trunk/mcs/; revision=51031
Diffstat (limited to 'mcs/class/Commons.Xml.Relaxng')
| -rw-r--r-- | mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/NvdlXsdSupport.cs | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/ChangeLog b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/ChangeLog index 1b27ba3da36..20aca436b5d 100644 --- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/ChangeLog +++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/ChangeLog @@ -1,3 +1,8 @@ +2005-09-30 Atsushi Enomoto <atsushi@ximian.com> + + * NvdlXsdSupport.cs : related fix to r51030; XmlSchema.Read() now does + not consume EndElement. + 2005-09-25 Atsushi Enomoto <atsushi@ximian.com> * NvdlValidationProvider.cs : GetSchemaXmlStream() should take NVDL diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/NvdlXsdSupport.cs b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/NvdlXsdSupport.cs index bbbf303e604..579136d2fd7 100644 --- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/NvdlXsdSupport.cs +++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/NvdlXsdSupport.cs @@ -15,9 +15,15 @@ namespace Commons.Xml.Nvdl return null; ArrayList al = new ArrayList (); while (!reader.EOF) { + if (reader.NodeType != XmlNodeType.Element) { + reader.Read (); + continue; + } + reader.MoveToContent (); XmlSchema xs = XmlSchema.Read (reader, null); xs.Compile (null, config.XmlResolverInternal); al.Add (xs); + reader.Read (); } return new NvdlXsdValidatorGenerator (al.ToArray (typeof (XmlSchema)) as XmlSchema []); } |