2009-11-16 Gonzalo Paniagua Javier <gonzalo@novell.com>

* DefaultWatcher.cs: patch by James P. Mitchel III. The change corrects an instance of unsynchronized access to shared state and is probably the intent of the original code. svn path=/branches/mono-2-4/mcs/; revision=146292
baulig · Nov 16, 2009 · b1d882a · b1d882a
1 parent 5dba9fd
commit b1d882a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/mcs/class/System/System.IO/ChangeLog b/mcs/class/System/System.IO/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-16 Gonzalo Paniagua Javier <gonzalo@novell.com>
+
+	* DefaultWatcher.cs: patch by James P. Mitchel III.
+	The change corrects an instance of unsynchronized access to shared
+	state and is probably the intent of the original code.
+
 2009-09-30  Marek Habersack  <mhabersack@novell.com>
 
 	* InotifyWatcher.cs: optimized the Renamed event child update loop

diff --git a/mcs/class/System/System.IO/DefaultWatcher.cs b/mcs/class/System/System.IO/DefaultWatcher.cs
@@ -148,7 +148,7 @@ void Monitor ()
 					my_watches = (Hashtable) watches.Clone ();
 				}
 
-				if (watches.Count != 0) {
+				if (my_watches.Count != 0) {
 					zeroes = 0;
 					foreach (DefaultWatcherData data in my_watches.Values) {
 						bool remove = UpdateDataAndDispatch (data, true);