2003-04-17 Pedro Mart�nez Juli� <[email protected]>

    * Timer.cs: Change the position of two lines because they were
    before the "if" that ensures the integrity. After this, the first of
    that two lines was producing a NullReferenceException.

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

mcs/class/corlib/System.Threading/ChangeLog

@@ -1,3 +1,9 @@
+2003-04-17  Pedro Martínez Juliá  <[email protected]>
+
+	* Timer.cs: Change the position of two lines because they were
+	before the "if" that ensures the integrity. After this, the first of
+	that two lines was producing a NullReferenceException.
+
 2003-04-09  Dick Porter  <[email protected]>
 
 	* Thread.cs: Make sure a reference to the ThreadStart delegate is

mcs/class/corlib/System.Threading/Timer.cs

@@ -85,14 +85,15 @@ namespace System.Threading
 
 					bool signaled = false;
 					while (true) {
-						wait.Reset ();
-						signaled = wait.WaitOne (period, false);
 						if (disposed)
 							return;
 
 						if (aborted)
 							break;
 
+						wait.Reset ();
+						signaled = wait.WaitOne (period, false);
+
 						if (!signaled) {
 							callback (state);
 						} else if (!WaitForDueTime ()) {