Fix bug #1558 - return editable XPathNavigator from editable navigator's CreateNaviga...

diff --git a/mcs/class/System.XML/Mono.Xml.XPath/XPathEditableDocument.cs b/mcs/class/System.XML/Mono.Xml.XPath/XPathEditableDocument.cs
index 3e2f3689373c50c1669decf5754c1e5bec80e53b..1c21cae56243233a0ac587c61787e25b13519841 100644 (file)
--- a/mcs/class/System.XML/Mono.Xml.XPath/XPathEditableDocument.cs
+++ b/mcs/class/System.XML/Mono.Xml.XPath/XPathEditableDocument.cs
@@ -529,7 +529,7 @@ namespace Mono.Xml.XPath
 
                public override XPathNavigator CreateNavigator ()
                {
-                       return navigator.Clone ();
+                       return Clone ();
                }
 
                public XmlNode GetNode ()

diff --git a/mcs/class/System.XML/Test/System.Xml.XPath/XPathEditableNavigatorTests.cs b/mcs/class/System.XML/Test/System.Xml.XPath/XPathEditableNavigatorTests.cs
index 8e4d4baf5cb0e0c44f21743753489f4ae1b70220..022dfc7c450e84e131f58795d6818f8cce7b3cf2 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml.XPath/XPathEditableNavigatorTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml.XPath/XPathEditableNavigatorTests.cs
@@ -780,6 +780,15 @@ namespace MonoTests.System.Xml.XPath
                        using (XmlWriter w = y.CreateNavigator ().AppendChild ())
                                w.WriteAttributeString ("test", "test1");
                }
+
+               [Test] // bug #1558
+               public void CreateNavigatorReturnsEdidable ()
+               {
+                       var document = new XmlDocument();
+                       document.LoadXml ("<div>hello world</div>");
+                       XPathNavigator navigator = document.CreateNavigator ().CreateNavigator ();
+                       navigator.SelectSingleNode ("//div").SetValue ("hello world 2");
+               }
        }
 }