2007-08-30 Dick Porter <dick@ximian.com>

	* Thread.cs: Initialise synch_cs to null now we aren't using it as
	a monitor lock

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

diff --git a/mcs/class/corlib/System.Threading/ChangeLog b/mcs/class/corlib/System.Threading/ChangeLog
index 12843cd98162957c84e70ab44fcc013f91b9df31..d4733aa7474506f5fd434a87147ab0216bf8de87 100644 (file)
--- a/mcs/class/corlib/System.Threading/ChangeLog
+++ b/mcs/class/corlib/System.Threading/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-30  Dick Porter  <dick@ximian.com>
+
+       * Thread.cs: Initialise synch_cs to null now we aren't using it as
+       a monitor lock
+
 2007-08-10  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * Thread.cs: Throw ThreadStateException when retrieving ApartmentState

diff --git a/mcs/class/corlib/System.Threading/Thread.cs b/mcs/class/corlib/System.Threading/Thread.cs
index a01722adbcd84d16848e334649558dbbf381cfd0..d33120c029efdba1835c0a663254ccc3b478e2ff 100644 (file)
--- a/mcs/class/corlib/System.Threading/Thread.cs
+++ b/mcs/class/corlib/System.Threading/Thread.cs
@@ -88,8 +88,8 @@ namespace System.Threading {
                private IntPtr suspend_event;
                private IntPtr suspended_event;
                private IntPtr resume_event;
-               /* Don't lock on synch_lock in managed code, since it can result in deadlocks */
-               private object synch_lock = new Object();
+               /* Don't lock on synch_cs in managed code, since it can result in deadlocks */
+               private object synch_cs = null;
                private IntPtr serialized_culture_info;
                private int serialized_culture_info_len;
                private IntPtr serialized_ui_culture_info;