2003-01-09 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* Type.cs:
	(IsSubclassOf): return false when null. Use != instead of Equals.

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

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index 2d848c9ad3338c2725c625da6aa0d326a922d96a..e2cc652e56dcdf6812d51f995b148ba38fd57317 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,4 +1,9 @@
 
+2003-01-09  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * Type.cs:
+       (IsSubclassOf): return false when null. Use != instead of Equals.
+
 2003-01-09  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * Type.cs: fixed IsSubclassOf. Patch from Zoltan Varga.

diff --git a/mcs/class/corlib/System/Type.cs b/mcs/class/corlib/System/Type.cs
index 62e8d0f6e7e04f14ba3d209c676008aea69d9d31..f1bbdeff1a16e244118317995ccd211815ab882d 100644 (file)
--- a/mcs/class/corlib/System/Type.cs
+++ b/mcs/class/corlib/System/Type.cs
@@ -471,9 +471,9 @@ namespace System {
                public virtual bool IsSubclassOf (Type c)
                {
                        if (c == null)
-                               throw new ArgumentNullException ("c");
+                               return false;
 
-                       return !Equals (c) && type_is_subtype_of (this, c, false);
+                       return (this != c) && type_is_subtype_of (this, c, false);
                }
 
                public virtual Type[] FindInterfaces (TypeFilter filter, object filterCriteria)