2004-10-29 Atsushi Enomoto <atsushi@ximian.com>

* XmlDocumentNavigator.cs : GetNode() should consider namespace nodes. * XmlNode.cs : dustclean. svn path=/trunk/mcs/; revision=35415
mono · Oct 29, 2004 · 0018d2c · 0018d2c
1 parent 49f8de6
commit 0018d2c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-29  Atsushi Enomoto <atsushi@ximian.com>
+
+	* XmlDocumentNavigator.cs : GetNode() should consider namespace nodes.
+	* XmlNode.cs : dustclean.
+
 2004-10-28  Atsushi Enomoto <atsushi@ximian.com>
 
 	* XmlDocument.cs : use XPathEditableDocument again.

diff --git a/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs b/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs
@@ -646,12 +646,12 @@ public override void MoveToRoot ()
 			NsNode = null;
 		}
 
-		internal XmlNode Node { get { return NsNode != null ? NsNode : node; } }
+		private XmlNode Node { get { return NsNode != null ? NsNode : node; } }
 
-                XmlNode IHasXmlNode.GetNode ()
-                {
-                        return node;
-                }
+		XmlNode IHasXmlNode.GetNode ()
+		{
+			return Node;
+		}
 
 		#endregion
 	}

diff --git a/mcs/class/System.XML/System.Xml/XmlNode.cs b/mcs/class/System.XML/System.Xml/XmlNode.cs
@@ -749,10 +749,7 @@ public XmlNode SelectSingleNode (string xpath, XmlNamespaceManager nsmgr)
 			XPathNodeIterator iter = nav.Select (expr);
 			if (!iter.MoveNext ())
 				return null;
-if (iter.Current is IHasXmlNode)
 			return ((IHasXmlNode) iter.Current).GetNode ();
-else
-throw new Exception ("It should be IHasXmlNode: " + iter.Current.GetType ());
 		}
 
 		internal static void SetReadOnly (XmlNode n)