diff options
| author | Sebastien Pouliot <sebastien@ximian.com> | 2005-11-16 18:38:47 +0300 |
|---|---|---|
| committer | Sebastien Pouliot <sebastien@ximian.com> | 2005-11-16 18:38:47 +0300 |
| commit | eeb2834d7ba1d2c660df941cc63ad2c1d179c45d (patch) | |
| tree | 0cf4184d19b3b0e959e4cd9cccd195b9bf73bbd9 /mcs/class/System/System.Timers | |
| parent | deed1303023f191a3fd668c2c488e99f8da8231c (diff) | |
2005-11-16 Sebastien Pouliot <sebastien@ximian.com>
* TimersDescriptionAttribute.cs: Revert Description property fix
because it doesn't always returns null (exact conditions unknown).
svn path=/trunk/mcs/; revision=53123
Diffstat (limited to 'mcs/class/System/System.Timers')
| -rw-r--r-- | mcs/class/System/System.Timers/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System/System.Timers/TimersDescriptionAttribute.cs | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/mcs/class/System/System.Timers/ChangeLog b/mcs/class/System/System.Timers/ChangeLog index 766e12adba2..0569399c8f2 100644 --- a/mcs/class/System/System.Timers/ChangeLog +++ b/mcs/class/System/System.Timers/ChangeLog @@ -1,3 +1,8 @@ +2005-11-16 Sebastien Pouliot <sebastien@ximian.com> + + * TimersDescriptionAttribute.cs: Revert Description property fix + because it doesn't always returns null (exact conditions unknown). + 2005-11-16 Sebastien Pouliot <sebastien@ximian.com> * ElapsedEventHandler.cs: Remove [Serializable] from 2.0 profile. diff --git a/mcs/class/System/System.Timers/TimersDescriptionAttribute.cs b/mcs/class/System/System.Timers/TimersDescriptionAttribute.cs index 17cee006860..e774e2adf6e 100644 --- a/mcs/class/System/System.Timers/TimersDescriptionAttribute.cs +++ b/mcs/class/System/System.Timers/TimersDescriptionAttribute.cs @@ -39,9 +39,9 @@ namespace System.Timers { } + // FIXME: when created in the unit test Description always return null public override string Description { - get { return null; } + get { return base.Description; } } } } - |