Author: atsushi
Date: 2007-09-06 01:18:18 -0400 (Thu, 06 Sep 2007)
New Revision: 85389
Modified:
trunk/mcs/class/corlib/System.IO/BufferedStream.cs
trunk/mcs/class/corlib/System.IO/ChangeLog
trunk/mcs/class/corlib/System.IO/MemoryStream.cs
trunk/mcs/class/corlib/System.IO/Stream.cs
Log:
2007-09-06 Atsushi Enomoto <[EMAIL PROTECTED]>
* Stream.cs, BufferedStream.cs, MemoryStream.cs: in 2.0 override
Dispose(bool) rather than Close().
Stream.Dispose() is virtual in 2.0.
Modified: trunk/mcs/class/corlib/System.IO/BufferedStream.cs
===================================================================
--- trunk/mcs/class/corlib/System.IO/BufferedStream.cs 2007-09-06 05:16:16 UTC
(rev 85388)
+++ trunk/mcs/class/corlib/System.IO/BufferedStream.cs 2007-09-06 05:18:18 UTC
(rev 85389)
@@ -111,8 +111,15 @@
}
}
+#if NET_2_0
+ protected override void Dispose (bool disposing)
+ {
+ if (disposed)
+ return;
+#else
public override void Close ()
{
+#endif
if (m_buffer != null)
Flush();
Modified: trunk/mcs/class/corlib/System.IO/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.IO/ChangeLog 2007-09-06 05:16:16 UTC (rev
85388)
+++ trunk/mcs/class/corlib/System.IO/ChangeLog 2007-09-06 05:18:18 UTC (rev
85389)
@@ -1,3 +1,9 @@
+2007-09-06 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * Stream.cs, BufferedStream.cs, MemoryStream.cs: in 2.0 override
+ Dispose(bool) rather than Close().
+ Stream.Dispose() is virtual in 2.0.
+
2007-08-24 Gert Driesen <[EMAIL PROTECTED]>
* BinaryReader.cs: Fixed line endings.
Modified: trunk/mcs/class/corlib/System.IO/MemoryStream.cs
===================================================================
--- trunk/mcs/class/corlib/System.IO/MemoryStream.cs 2007-09-06 05:16:16 UTC
(rev 85388)
+++ trunk/mcs/class/corlib/System.IO/MemoryStream.cs 2007-09-06 05:18:18 UTC
(rev 85389)
@@ -215,7 +215,11 @@
}
}
+#if NET_2_0
+ protected override void Dispose (bool disposing)
+#else
public override void Close ()
+#endif
{
streamClosed = true;
expandable = false;
Modified: trunk/mcs/class/corlib/System.IO/Stream.cs
===================================================================
--- trunk/mcs/class/corlib/System.IO/Stream.cs 2007-09-06 05:16:16 UTC (rev
85388)
+++ trunk/mcs/class/corlib/System.IO/Stream.cs 2007-09-06 05:18:18 UTC (rev
85389)
@@ -139,11 +139,11 @@
// nothing
}
-#endif
void IDisposable.Dispose ()
{
Close ();
}
+#endif
#if NET_2_0
[Obsolete ("CreateWaitHandle is due for removal. Use \"new
ManualResetEvent(false)\" instead.")]
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
