2006-08-16 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* FileSystemWatcher.cs: avoid argument null when we don't know yet the
	target of a rename.

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

diff --git a/mcs/class/System/System.IO/ChangeLog b/mcs/class/System/System.IO/ChangeLog
index 1a5345f2798104016df328a8056a058398491778..bc5dce604019b68db03393375f1e554f07794ef8 100644 (file)
--- a/mcs/class/System/System.IO/ChangeLog
+++ b/mcs/class/System/System.IO/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-16 Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * FileSystemWatcher.cs: avoid argument null when we don't know yet the
+       target of a rename.
+
 2006-08-03 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * InotifyWatcher.cs: warn about inotify user watches limit.

diff --git a/mcs/class/System/System.IO/FileSystemWatcher.cs b/mcs/class/System/System.IO/FileSystemWatcher.cs
index b6ef5ce4492dfcc91b8487d83a5648792c926d83..98cd41d7bd3e56388a465c81612c449c8f6026d4 100644 (file)
--- a/mcs/class/System/System.IO/FileSystemWatcher.cs
+++ b/mcs/class/System/System.IO/FileSystemWatcher.cs
@@ -449,7 +449,7 @@ namespace System.IO {
                                }
                                lastData.OldName = filename;
                                lastData.ChangeType = WatcherChangeTypes.Renamed;
-                               renamed = new RenamedEventArgs (WatcherChangeTypes.Renamed, path, null, filename);
+                               renamed = new RenamedEventArgs (WatcherChangeTypes.Renamed, path, filename, "");
                                break;
                        case FileAction.RenamedNewName:
                                lastData.Name = filename;
@@ -457,7 +457,7 @@ namespace System.IO {
                                if (renamed != null) {
                                        renamed.SetName (filename);
                                } else {
-                                       renamed = new RenamedEventArgs (WatcherChangeTypes.Renamed, path, filename, null);
+                                       renamed = new RenamedEventArgs (WatcherChangeTypes.Renamed, path, "", filename);
                                }
                                OnRenamed (renamed);
                                renamed = null;