2004-06-03 Sebastien Pouliot <sebastien@ximian.com>

	* Delegate.cs: Fix the NullReferenceException in Combine(Delegate[]).

svn path=/trunk/mcs/; revision=28807

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index f66ab0ba5f63ecd98b05ce49ed6217fd75479a6a..24676954a21f757c00c6c128a05309c4b5e00af4 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-03  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * Delegate.cs: Fix the NullReferenceException in Combine(Delegate[]).
+

 2004-06-02  Sebastien Pouliot  <sebastien@ximian.com>
 
        * TimeSpan.cs: Fixed overflow issues when delaing with big (days) time
 2004-06-02  Sebastien Pouliot  <sebastien@ximian.com>
 
        * TimeSpan.cs: Fixed overflow issues when delaing with big (days) time

diff --git a/mcs/class/corlib/System/Delegate.cs b/mcs/class/corlib/System/Delegate.cs
index 6a52e5be8bbc34cadc720a22e9cd7767af97fac7..67e0963da3bed693878431c617349fd80b01c4a4 100644 (file)
--- a/mcs/class/corlib/System/Delegate.cs
+++ b/mcs/class/corlib/System/Delegate.cs
@@ -256,6 +256,9 @@ namespace System
                /// </symmary>
                public static Delegate Combine (Delegate[] delegates)
                {
                /// </symmary>
                public static Delegate Combine (Delegate[] delegates)
                {

+                       if (delegates == null)
+                               return null;
+

                        Delegate retval = null;
 
                        foreach (Delegate next in delegates)
                        Delegate retval = null;
 
                        foreach (Delegate next in delegates)