[corlib] Remove redundant checks from delegate::combine

diff --git a/mcs/class/corlib/System/Delegate.cs b/mcs/class/corlib/System/Delegate.cs
index 8b9ade4dd46b7159f2295bbba42f1caee1910819..26fff1d5c463c1d5886bb39fac040f1cd5e2b119 100644 (file)
--- a/mcs/class/corlib/System/Delegate.cs
+++ b/mcs/class/corlib/System/Delegate.cs
@@ -524,17 +524,9 @@ namespace System
                /// </symmary>
                public static Delegate Combine (Delegate a, Delegate b)
                {
-                       if (a == null) {
-                               if (b == null)
-                                       return null;
+                       if (a == null)
                                return b;
-                       } else 
-                               if (b == null)
-                                       return a;
 
-                       if (a.GetType () != b.GetType ())
-                               throw new ArgumentException (Locale.GetText ("Incompatible Delegate Types. First is {0} second is {1}.", a.GetType ().FullName, b.GetType ().FullName));
-                       
                        return a.CombineImpl (b);
                }
 

diff --git a/mcs/class/corlib/System/MulticastDelegate.cs b/mcs/class/corlib/System/MulticastDelegate.cs
index 0550ff82843fd239d47fd94d68bf4d071ae3e5de..1a869578a1c6088679c5d428434bf0a420aacbeb 100644 (file)
--- a/mcs/class/corlib/System/MulticastDelegate.cs
+++ b/mcs/class/corlib/System/MulticastDelegate.cs
@@ -143,6 +143,9 @@ namespace System
                // </summary>
                protected sealed override Delegate CombineImpl (Delegate follow)
                {
+                       if (follow == null)
+                               return this;
+
                        MulticastDelegate combined, orig, clone;
 
                        if (this.GetType() != follow.GetType ())