diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2009-05-15 15:14:59 +0400 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2009-05-15 15:14:59 +0400 |
| commit | eaf8f77e85d6143809958a3a1d50fc47ccc3bee0 (patch) | |
| tree | a77be43f1a331b066e2e9e336776bc1a882a06c5 /mcs/class/System.XML/Mono.Xml.XPath | |
| parent | cdae12f3ef49c482b188ebe11b3167ffe23ce3e6 (diff) | |
2009-05-15 Atsushi Enomoto <atsushi@ximian.com>
* XPathNavigatorReader.cs : LookupNamespace() in XmlReader from
ReadSubtree() should work correctly on text nodes.
* XPathNavigatorCommonTests.cs : test that LookupNamespace() in
XmlReader from ReadSubtree() works correctly on text nodes.
svn path=/trunk/mcs/; revision=134196
Diffstat (limited to 'mcs/class/System.XML/Mono.Xml.XPath')
| -rw-r--r-- | mcs/class/System.XML/Mono.Xml.XPath/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System.XML/Mono.Xml.XPath/XPathNavigatorReader.cs | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/mcs/class/System.XML/Mono.Xml.XPath/ChangeLog b/mcs/class/System.XML/Mono.Xml.XPath/ChangeLog index b5c6a20bff4..c3f24600a7c 100644 --- a/mcs/class/System.XML/Mono.Xml.XPath/ChangeLog +++ b/mcs/class/System.XML/Mono.Xml.XPath/ChangeLog @@ -1,3 +1,8 @@ +2009-05-15 Atsushi Enomoto <atsushi@ximian.com> + + * XPathNavigatorReader.cs : LookupNamespace() in XmlReader from + ReadSubtree() should work correctly on text nodes. + 2008-09-10 Atsushi Enomoto <atsushi@ximian,com> * XPathEditableDocument.cs : added some overrides. diff --git a/mcs/class/System.XML/Mono.Xml.XPath/XPathNavigatorReader.cs b/mcs/class/System.XML/Mono.Xml.XPath/XPathNavigatorReader.cs index 01dcff32811..d2dd70c82a7 100644 --- a/mcs/class/System.XML/Mono.Xml.XPath/XPathNavigatorReader.cs +++ b/mcs/class/System.XML/Mono.Xml.XPath/XPathNavigatorReader.cs @@ -718,6 +718,8 @@ namespace Mono.Xml.XPath XPathNavigator backup = current.Clone ();
try {
this.MoveToElement ();
+ if (current.NodeType != XPathNodeType.Element) // text etc.
+ current.MoveToParent ();
if (current.MoveToFirstNamespace ()) {
do {
if (current.LocalName == prefix)
|