Merge pull request #2092 from kasthack/system-web-stuff-import

[mono.git] / mcs / class / System / System.Net / FtpDataStream.cs

diff --git a/mcs/class/System/System.Net/FtpDataStream.cs b/mcs/class/System/System.Net/FtpDataStream.cs
index e2685288ff3f68d0d9243cb10ff9fdaba519a606..7bb47468c3aa899d5875cce7eaa0323b854d1f57 100644 (file)
--- a/mcs/class/System/System.Net/FtpDataStream.cs
+++ b/mcs/class/System/System.Net/FtpDataStream.cs
@@ -14,8 +14,6 @@ using System.Runtime.Remoting.Messaging;
 using System.Threading;
 using System.Net;
 
-#if NET_2_0
-
 namespace System.Net
 {
        class FtpDataStream : Stream, IDisposable
@@ -110,7 +108,8 @@ namespace System.Net
 
                        totalRead += nbytes;
                        if (nbytes == 0) {
-                               networkStream.Close ();
+                               networkStream = null;
+                               request.CloseDataConnection ();
                                request.SetTransferCompleted ();
                        }
 
@@ -233,11 +232,7 @@ namespace System.Net
 
                        disposed = true;
                        if (networkStream != null)  {
-                               try {
-                                       networkStream.Close ();
-                               } catch {
-                               }
-
+                               request.CloseDataConnection ();
                                request.SetTransferCompleted ();
                                request = null;
                                networkStream = null;
@@ -254,5 +249,4 @@ namespace System.Net
        }
 }
 
-#endif