Author: zoltan
Date: 2007-06-01 19:19:22 -0400 (Fri, 01 Jun 2007)
New Revision: 78464
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): Handle properties correctly. Fixes
#81797.
Modified: trunk/mcs/class/corlib/System/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System/ChangeLog 2007-06-01 22:14:09 UTC (rev
78463)
+++ trunk/mcs/class/corlib/System/ChangeLog 2007-06-01 23:19:22 UTC (rev
78464)
@@ -1,3 +1,7 @@
+2007-06-02 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * MonoCustomAttrs.cs (GetBase): Handle properties correctly. Fixes
#81797.
+
2007-05-31 Zoltan Varga <[EMAIL PROTECTED]>
* Delegate.cs: Add invoke_impl field. Reorder fields for better cache
behavior. Add
Modified: trunk/mcs/class/corlib/System/MonoCustomAttrs.cs
===================================================================
--- trunk/mcs/class/corlib/System/MonoCustomAttrs.cs 2007-06-01 22:14:09 UTC
(rev 78463)
+++ trunk/mcs/class/corlib/System/MonoCustomAttrs.cs 2007-06-01 23:19:22 UTC
(rev 78464)
@@ -298,9 +298,12 @@
if (obj is MonoProperty)
{
MonoProperty prop = (MonoProperty) obj;
- method = prop.GetGetMethod (true);
- if (method == null)
- method = prop.GetSetMethod (true);
+ 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
