* Timer.cs: On 2.0 profile, only allow 32-bit interval in ctor.

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

diff --git a/mcs/class/System/System.Timers/ChangeLog b/mcs/class/System/System.Timers/ChangeLog
index 6662185c4b0770d4376e523f126c3dd83c17f92a..288828857275503037468548fd453d9fc3d6e42d 100644 (file)
--- a/mcs/class/System/System.Timers/ChangeLog
+++ b/mcs/class/System/System.Timers/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-05  Gert Driesen  <drieseng@users.sourceforge.net>
+
+       * Timer.cs: On 2.0 profile, only allow 32-bit interval in ctor.
+
 2006-12-19  Robert Jordan  <robertj@gmx.net>
 
        * Timer.cs: Apply the latest patch at attached to bug #77847.

diff --git a/mcs/class/System/System.Timers/Timer.cs b/mcs/class/System/System.Timers/Timer.cs
index b0b8dacde15ae1d12dd92800372260c0fcdc96b9..b283441bd7ff0b12c3af163da5662c76705e1014 100644 (file)
--- a/mcs/class/System/System.Timers/Timer.cs
+++ b/mcs/class/System/System.Timers/Timer.cs
@@ -46,7 +46,7 @@ namespace System.Timers
                ISynchronizeInvoke so;
                ManualResetEvent wait;
                Thread thread;
-               object locker = new object ();
+               readonly object locker = new object ();
 
                [Category("Behavior")]
                [TimersDescription("Occurs when the Interval has elapsed.")]
@@ -58,14 +58,16 @@ namespace System.Timers
 
                public Timer (double interval)
                {
+#if NET_2_0
+                       // MSBUG: https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=296761
+                       if (interval > 0x7FFFFFFF)
+                               throw new ArgumentException ("Invalid value: " + interval, "interval");
+#endif
+
                        autoReset = true;
-                       enabled = false;
                        Interval = interval;
-                       so = null;
-                       wait = null;
                }
 
-
                [Category("Behavior")]
                [DefaultValue(true)]
                [TimersDescription("Indicates whether the timer will be restarted when it is enabled.")]
@@ -212,4 +214,3 @@ namespace System.Timers
                }
        }
 }
-