Merge pull request #2305 from ludovic-henry/fix-threadpool-36414

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

diff --git a/mcs/class/System/System.Net/FtpAsyncResult.cs b/mcs/class/System/System.Net/FtpAsyncResult.cs
index f2c224f1ac936b5a196eeadd075a95f8685c3a7b..33e67372c48333256cdb5b49c05c7212de4d9fff 100644 (file)
--- a/mcs/class/System/System.Net/FtpAsyncResult.cs
+++ b/mcs/class/System/System.Net/FtpAsyncResult.cs
@@ -9,11 +9,9 @@
 
 using System;
 using System.IO;
-using System.Threading;\r
+using System.Threading;
 using System.Net;
 
-#if NET_2_0
-
 namespace System.Net 
 {
        class FtpAsyncResult : IAsyncResult
@@ -89,8 +87,8 @@ namespace System.Net
                internal Stream Stream {
                        get {
                                return stream;
-                       }\r
-\r
+                       }
+
                        set { stream = value; }
                }
 
@@ -118,9 +116,9 @@ namespace System.Net
                        lock (locker) {
                                completed = true;
                                if (waitHandle != null)
-                                       waitHandle.Set ();\r
-                       }\r
-                       DoCallback ();\r
+                                       waitHandle.Set ();
+                       }
+                       DoCallback ();
                }
 
                internal void SetCompleted (bool synch, FtpWebResponse response)
@@ -134,13 +132,13 @@ namespace System.Net
                }
 
                internal void DoCallback ()
-               {\r
-                       if (callback != null)\r
-                               try {\r
-                                       callback (this);\r
-                               }\r
-                               catch (Exception) {\r
-                               }\r
+               {
+                       if (callback != null)
+                               try {
+                                       callback (this);
+                               }
+                               catch (Exception) {
+                               }
                }
 
                // Cleanup resources
@@ -161,5 +159,4 @@ namespace System.Net
        }
 }
 
-#endif