diff options
| author | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2004-08-04 21:00:29 +0400 |
|---|---|---|
| committer | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2004-08-04 21:00:29 +0400 |
| commit | 0e628c1783134367af5cb0de05b6a1a780a59f97 (patch) | |
| tree | a857ac723b6734b8e0b1fdec7f583fe50fe9d115 /mcs | |
| parent | c4aca7db675430de60d4e7a5b6c8ddbfbe8fa53b (diff) | |
same fix as HEAD
svn path=/branches/mono-1-0/mcs/; revision=31875
Diffstat (limited to 'mcs')
| -rw-r--r-- | mcs/class/corlib/System.Threading/ChangeLog | 5 | ||||
| -rwxr-xr-x | mcs/class/corlib/System.Threading/Timer.cs | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mcs/class/corlib/System.Threading/ChangeLog b/mcs/class/corlib/System.Threading/ChangeLog index 66587ac7c11..d6236617956 100644 --- a/mcs/class/corlib/System.Threading/ChangeLog +++ b/mcs/class/corlib/System.Threading/ChangeLog @@ -1,3 +1,8 @@ +2004-08-04 Gonzalo Paniagua Javier <gonzalo@ximian.com> + + * Timer.cs: don't invoke the callback if the period changes before the + due time. Fixes bug #62421. + 2004-07-15 Dick Porter <dick@ximian.com> * Thread.cs: Hold a lock in GetNamedDataSlot. Fixes bug 61582, diff --git a/mcs/class/corlib/System.Threading/Timer.cs b/mcs/class/corlib/System.Threading/Timer.cs index 164c60ef2ca..1675a5a4be7 100755 --- a/mcs/class/corlib/System.Threading/Timer.cs +++ b/mcs/class/corlib/System.Threading/Timer.cs @@ -195,10 +195,11 @@ namespace System.Threading if (runner == null) return false; - + + start_event.Reset (); + runner.Abort (); runner.DueTime = dueTime; runner.Period = period; - runner.Abort (); start_event.Set (); return true; } |