Author: atsushi
Date: 2007-11-21 12:27:29 -0500 (Wed, 21 Nov 2007)
New Revision: 90095

Modified:
   trunk/mcs/class/corlib/System.IO/ChangeLog
   trunk/mcs/class/corlib/System.IO/FileStream.cs
Log:
2007-11-21  Atsushi Enomoto  <[EMAIL PROTECTED]>

        * FileStream.cs : Close() does not exist in 2.0 (Stream does).
          Move GC.SuppressFinalize() to Dispose(true).



Modified: trunk/mcs/class/corlib/System.IO/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.IO/ChangeLog  2007-11-21 17:21:44 UTC (rev 
90094)
+++ trunk/mcs/class/corlib/System.IO/ChangeLog  2007-11-21 17:27:29 UTC (rev 
90095)
@@ -1,3 +1,8 @@
+2007-11-21  Atsushi Enomoto  <[EMAIL PROTECTED]>
+
+       * FileStream.cs : Close() does not exist in 2.0 (Stream does).
+         Move GC.SuppressFinalize() to Dispose(true).
+
 2007-11-12  Juraj Skripsky  <[EMAIL PROTECTED]>
 
        * Path.cs (GetRandomFileName): Return filenames containing only

Modified: trunk/mcs/class/corlib/System.IO/FileStream.cs
===================================================================
--- trunk/mcs/class/corlib/System.IO/FileStream.cs      2007-11-21 17:21:44 UTC 
(rev 90094)
+++ trunk/mcs/class/corlib/System.IO/FileStream.cs      2007-11-21 17:27:29 UTC 
(rev 90095)
@@ -816,11 +816,12 @@
                        //MonoIO.Flush (handle);
                }
 
+#if !NET_2_0
                public override void Close ()
                {
                        Dispose (true);
-                       GC.SuppressFinalize (this);     // remove from finalize 
queue
                }
+#endif
 
                public virtual void Lock (long position, long length)
                {
@@ -902,6 +903,8 @@
                        if (disposing) {
                                buf = null;
                        }
+                       if (disposing)
+                               GC.SupressFinalize (this);
                }
 
 #if NET_2_0

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to