Merge pull request #347 from JamesB7/master

[mono.git] / mcs / class / System / System.Net.Mail / SmtpException.cs

diff --git a/mcs/class/System/System.Net.Mail/SmtpException.cs b/mcs/class/System/System.Net.Mail/SmtpException.cs
index 44050faf64fd4d241b48f22d985ef0ad3aa0c4fc..4c76fd9bb9d4663dc5d65b81f1f57c9fa69fcba3 100644 (file)
--- a/mcs/class/System/System.Net.Mail/SmtpException.cs
+++ b/mcs/class/System/System.Net.Mail/SmtpException.cs
@@ -28,8 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
 using System.Runtime.Serialization;
 
 namespace System.Net.Mail {
@@ -45,32 +43,26 @@ namespace System.Net.Mail {
                #region Constructors
 
                public SmtpException ()
-                       : this ("Syntax error, command unrecognized.")
+                       : this (SmtpStatusCode.GeneralFailure)
                {
-                       statusCode = SmtpStatusCode.GeneralFailure;
                }
 
                public SmtpException (SmtpStatusCode statusCode)
-                       : this ()
+                       : this (statusCode, "Syntax error, command unrecognized.")
                {
-                       StatusCode = statusCode;
                }
 
                public SmtpException (string message)
-                       : base (message)
+                       : this (SmtpStatusCode.GeneralFailure, message)
                {
-                       statusCode = SmtpStatusCode.GeneralFailure;
                }
 
                protected SmtpException (SerializationInfo info, StreamingContext context)
                        : base (info, context)
                {
-                       if (info == null)
-                               throw new ArgumentNullException ("info");
                        try {
                                statusCode = (SmtpStatusCode) info.GetValue ("Status", typeof (int));
-                       }
-                       catch (SerializationException) {
+                       } catch (SerializationException) {
                                //For compliance with previously serialized version:
                                statusCode = (SmtpStatusCode) info.GetValue ("statusCode", typeof (SmtpStatusCode));
                        }
@@ -79,12 +71,13 @@ namespace System.Net.Mail {
                public SmtpException (SmtpStatusCode statusCode, string message)
                        : base (message)
                {
-                       StatusCode = statusCode;
+                       this.statusCode = statusCode;
                }
 
                public SmtpException (string message, Exception innerException)
                        : base (message, innerException)
                {
+                       statusCode = SmtpStatusCode.GeneralFailure;
                }
 
                #endregion // Constructors
@@ -114,4 +107,3 @@ namespace System.Net.Mail {
        }
 }
 
-#endif // NET_2_0