2008-09-01 Dick Porter <dick@ximian.com>

* InotifyWatcher.cs: Revert fix for bug 322330, as it is somehow breaking other stuff. (Ported from trunk) svn path=/branches/mono-2-0/mcs/; revision=112021
baulig · Sep 1, 2008 · 7c9abd6 · 7c9abd6
1 parent 4b791f4
commit 7c9abd6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/mcs/class/System/System.IO/ChangeLog b/mcs/class/System/System.IO/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-01  Dick Porter  <dick@ximian.com>
+
+	* InotifyWatcher.cs: Revert fix for bug 322330, as it is somehow
+	breaking other stuff.
+
 2008-06-20  Dick Porter  <dick@ximian.com>
 
 	* InotifyWatcher.cs: If a directory is renamed, make sure the old

diff --git a/mcs/class/System/System.IO/InotifyWatcher.cs b/mcs/class/System/System.IO/InotifyWatcher.cs
@@ -176,21 +176,6 @@ static void AppendRequestData (InotifyData data)
 		{
 			int wd = data.Watch;
 
-			/* If AddDirectoryWatch() in
-			 * StartMonitoringDirectory() returns a watch
-			 * descriptor that's already being used, it
-			 * means it modified an existing watch.  So
-			 * remove the old one, so we don't report
-			 * duplicate entries.  But don't call
-			 * StopMonitoringDirectory (like after every
-			 * other call to RemoveRequestData), as that
-			 * will stop monitoring the new one too.  See
-			 * bug 322330
-			 */
-			foreach (InotifyData fd in GetEnumerator (requests[wd])) {
-				RemoveRequestData (fd);
-			}
-
 			object obj = requests [wd];
 			ArrayList list = null;
 			if (obj == null) {