2010-04-16 Rodrigo Kumpera <rkumpera@novell.com>

	* MonoCustomAttrs.cs (GetBasePropertyDefinition): Use
	GetBaseMethod instead of GetMethodDefinition otherwise
	we skip intermediate overloads.

	Fixes #499569.

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

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index cd4e3ca0b25f9d51d1ee33315dddf7a25ec23481..3ccf94db573a1caa557319bff3462e5e5bc1e9ce 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-16 Rodrigo Kumpera  <rkumpera@novell.com>
+
+       * MonoCustomAttrs.cs (GetBasePropertyDefinition): Use
+       GetBaseMethod instead of GetMethodDefinition otherwise
+       we skip intermediate overloads.
+
+       Fixes #499569.
+
 2010-04-16  Sebastien Pouliot  <sebastien@ximian.com>
 
        * Environment.cs: Ensure elevated trust when calling

diff --git a/mcs/class/corlib/System/MonoCustomAttrs.cs b/mcs/class/corlib/System/MonoCustomAttrs.cs
index 23a5313a58314c0fed9a39d33f3abd46935371a8..0afe4a487cf5794a7df67b7ceaa249d27f06d35c 100644 (file)
--- a/mcs/class/corlib/System/MonoCustomAttrs.cs
+++ b/mcs/class/corlib/System/MonoCustomAttrs.cs
@@ -332,7 +332,7 @@ namespace System
                        if (method == null || !method.IsVirtual)
                                return null;
 
-                       MethodInfo baseMethod = method.GetBaseDefinition ();
+                       MethodInfo baseMethod = method.GetBaseMethod ();
                        if (baseMethod != null && baseMethod != method) {
                                ParameterInfo[] parameters = property.GetIndexParameters ();
                                if (parameters != null && parameters.Length > 0) {