2007-06-02 Zoltan Varga <vargaz@gmail.com>

	* MonoCustomAttrs.cs (GetBase): Revert last change as it breaks the build.

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

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index 677db9a1216b2ee52f68edffc89b499d88c8c209..e00d3319d5177b38ed07e8a59c1570fe8cf469ce 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,5 +1,7 @@
 2007-06-02  Zoltan Varga  <vargaz@gmail.com>
 
+       * MonoCustomAttrs.cs (GetBase): Revert last change as it breaks the build.
+       
        * MonoCustomAttrs.cs (GetBase): Handle properties correctly. Fixes #81797.
 
 2007-05-31  Zoltan Varga  <vargaz@gmail.com>

diff --git a/mcs/class/corlib/System/MonoCustomAttrs.cs b/mcs/class/corlib/System/MonoCustomAttrs.cs
index d2470a1eaacb51e0b9eee1efb7751c1ec3bb75bc..a28627c056b47342f5f689b7fff28b3500857a1c 100644 (file)
--- a/mcs/class/corlib/System/MonoCustomAttrs.cs
+++ b/mcs/class/corlib/System/MonoCustomAttrs.cs
@@ -297,6 +297,11 @@ namespace System
                        MethodInfo method = null;
                        if (obj is MonoProperty)
                        {
+                               MonoProperty prop = (MonoProperty) obj;
+                               method = prop.GetGetMethod (true);
+                               if (method == null)
+                                       method = prop.GetSetMethod (true);
+/*
                                MonoProperty prop = (MonoProperty) obj;
                                if (prop.DeclaringType.BaseType != null) {
                                        PropertyInfo baseProp = prop.DeclaringType.BaseType.GetProperty (prop.Name);
@@ -304,6 +309,7 @@ namespace System
                                                return baseProp;
                                }
                                return null;
+*/
                        }
                        else if (obj is MonoMethod)
                        {