diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2009-07-22 15:05:00 +0400 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2009-07-22 15:05:00 +0400 |
| commit | 60d5aeb3f8c43e7f209e9b42e08b1000d1fb224a (patch) | |
| tree | ac49be06767e753a6a15a96a6d594fc02c02d98c /mcs/class/System.XML/System.Xml.XPath | |
| parent | 2204b9afbb1dc6691b7c7c3b8f666f948bc980f4 (diff) | |
2009-07-22 Atsushi Enomoto <atsushi@ximian.com>
* XPathNavigator.cs : name test did not handle String.Empty cases
for name and ns (i.e. no filter). Fixed bug #515136.
* XPathNavigatorTests.cs : added test for bug #515136.
svn path=/trunk/mcs/; revision=138384
Diffstat (limited to 'mcs/class/System.XML/System.Xml.XPath')
| -rw-r--r-- | mcs/class/System.XML/System.Xml.XPath/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mcs/class/System.XML/System.Xml.XPath/ChangeLog b/mcs/class/System.XML/System.Xml.XPath/ChangeLog index 6832a357f56..bd83eede4a0 100644 --- a/mcs/class/System.XML/System.Xml.XPath/ChangeLog +++ b/mcs/class/System.XML/System.Xml.XPath/ChangeLog @@ -1,3 +1,8 @@ +2009-07-22 Atsushi Enomoto <atsushi@ximian.com> + + * XPathNavigator.cs : name test did not handle String.Empty cases + for name and ns (i.e. no filter). Fixed bug #515136. + 2009-06-09 Gonzalo Paniagua, Miguel de Icaza <gonzalo@novell.com, miguel@novell.com> * Expression.cs: improve the ExpressionCache, it still does not diff --git a/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs b/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs index 981d06a92d6..151df2eaada 100644 --- a/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs +++ b/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs @@ -661,7 +661,7 @@ namespace System.Xml.XPath nav.MoveToFirstChild (); XPathNavigator nav2 = nav.Clone (); do { - if (nav.LocalName == name && nav.NamespaceURI == ns) { + if ((name == String.Empty || nav.LocalName == name) && (ns == String.Empty || nav.NamespaceURI == ns)) { nav2.MoveTo (nav); yield return nav2; } |