patched for post-mono-2-2
authorC.J. Adams-Collier <cjac@colliertech.org>
Fri, 16 Apr 2010 19:40:06 +0000 (19:40 -0000)
committerC.J. Adams-Collier <cjac@colliertech.org>
Fri, 16 Apr 2010 19:40:06 +0000 (19:40 -0000)
svn path=/trunk/mcs/; revision=155652

mcs/tools/corcompare/mono-api-diff.cs

index 3ef9815d9898b9056ba38421fbc3cf2e05a6280a..b3137ae0a5d631861e6bbfcc1432fa90135a7cf3 100644 (file)
@@ -740,6 +740,12 @@ namespace Mono.AssemblyCompare
                                child = child.NextSibling;
                        }
 
+                       if (child != null && child.Name == "generic-parameters") {
+                               // HACK: ignore this tag as it doesn't seem to
+                               // add any value when checking for differences
+                               return;
+                       }
+
                        if (child == null)
                                return;
 
@@ -1558,9 +1564,11 @@ namespace Mono.AssemblyCompare
                public override string GetNodeKey (string name, XmlNode node)
                {
                        XmlAttributeCollection atts = node.Attributes;
-                       return String.Format ("{0}:{1}:{2}", atts ["name"].Value,
-                                                               atts ["ptype"].Value,
-                                                               atts ["params"].Value);
+                       return String.Format ("{0}:{1}:{2}",
+                                             (atts["name"]   != null ? atts["name"].Value   : ""),
+                                             (atts["ptype"]  != null ? atts["ptype"].Value  : ""),
+                                             (atts["params"] != null ? atts["params"].Value : "")
+                                             );
                }
 
                public override string GroupName {