[monodoc] Ditto for fetching type node parents of subnodes.

diff --git a/mcs/class/monodoc/Monodoc/providers/ecma-provider.cs b/mcs/class/monodoc/Monodoc/providers/ecma-provider.cs
index 1cb79c87e946e8cee769f12433857a9b72664eef..53e54c4310bec6f0a4791fec6603e4be6597bc71 100644 (file)
--- a/mcs/class/monodoc/Monodoc/providers/ecma-provider.cs
+++ b/mcs/class/monodoc/Monodoc/providers/ecma-provider.cs
@@ -274,7 +274,8 @@ namespace Monodoc.Providers
                Node GetNodeTypeParent (Node node)
                {
                        // Type nodes are always at level 2 so we just need to get there
-                       while (node != null && node.Parent != null && !node.Parent.Parent.Element.StartsWith ("root:/", StringComparison.OrdinalIgnoreCase))
+                       while (node != null && node.Parent != null
+                              && !node.Parent.Parent.Element.StartsWith ("root:/", StringComparison.OrdinalIgnoreCase) && node.Parent.Parent.Parent != null)
                                node = node.Parent;
                        return node;
                }

diff --git a/mcs/class/monodoc/Test/Monodoc/HelpSourceTests.cs b/mcs/class/monodoc/Test/Monodoc/HelpSourceTests.cs
index 5816430c8d3b7a061d2d6ce6dbabd02a79e0aa67..867c9b793898dfb675e3aa05f15da5df70e6ec4c 100644 (file)
--- a/mcs/class/monodoc/Test/Monodoc/HelpSourceTests.cs
+++ b/mcs/class/monodoc/Test/Monodoc/HelpSourceTests.cs
@@ -165,6 +165,10 @@ namespace MonoTests.Monodoc
                        var nsChildUrl = hs.Tree.RootNode.ChildNodes.First ().PublicUrl;
                        Assert.IsNotNull (nsChildUrl);
                        StringAssert.StartsWith ("N:", nsChildUrl);
+                       // Verify GetNodeTypeParent
+                       var typeNode = hs.Tree.RootNode.ChildNodes.First ().ChildNodes.First ();
+                       var metaNode = typeNode.ChildNodes.First (cn => cn.Element == "M");
+                       StringAssert.StartsWith (typeNode.PublicUrl, metaNode.PublicUrl);
                }
 
                /*