Author: zoltan
Date: 2007-06-01 19:38:46 -0400 (Fri, 01 Jun 2007)
New Revision: 78466

Modified:
   trunk/mcs/class/corlib/System/ChangeLog
   trunk/mcs/class/corlib/System/MonoCustomAttrs.cs
Log:
2007-06-02  Zoltan Varga  <[EMAIL PROTECTED]>

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


Modified: trunk/mcs/class/corlib/System/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System/ChangeLog     2007-06-01 23:20:01 UTC (rev 
78465)
+++ trunk/mcs/class/corlib/System/ChangeLog     2007-06-01 23:38:46 UTC (rev 
78466)
@@ -1,5 +1,7 @@
 2007-06-02  Zoltan Varga  <[EMAIL PROTECTED]>
 
+       * MonoCustomAttrs.cs (GetBase): Revert last change as it breaks the 
build.
+       
        * MonoCustomAttrs.cs (GetBase): Handle properties correctly. Fixes 
#81797.
 
 2007-05-31  Zoltan Varga  <[EMAIL PROTECTED]>

Modified: trunk/mcs/class/corlib/System/MonoCustomAttrs.cs
===================================================================
--- trunk/mcs/class/corlib/System/MonoCustomAttrs.cs    2007-06-01 23:20:01 UTC 
(rev 78465)
+++ trunk/mcs/class/corlib/System/MonoCustomAttrs.cs    2007-06-01 23:38:46 UTC 
(rev 78466)
@@ -298,12 +298,18 @@
                        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);
                                        if (baseProp != prop)
                                                return baseProp;
                                }
                                return null;
+*/
                        }
                        else if (obj is MonoMethod)
                        {

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to