You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4net-dev@logging.apache.org by rg...@apache.org on 2009/03/16 17:41:25 UTC

svn commit: r754941 - /logging/log4net/trunk/src/Appender/SmtpAppender.cs

Author: rgrabowski
Date: Mon Mar 16 16:41:25 2009
New Revision: 754941

URL: http://svn.apache.org/viewvc?rev=754941&view=rev
Log:
Added using() block around MailMessage because it implements IDisposable. LOG4NET-180

Modified:
    logging/log4net/trunk/src/Appender/SmtpAppender.cs

Modified: logging/log4net/trunk/src/Appender/SmtpAppender.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/SmtpAppender.cs?rev=754941&r1=754940&r2=754941&view=diff
==============================================================================
--- logging/log4net/trunk/src/Appender/SmtpAppender.cs (original)
+++ logging/log4net/trunk/src/Appender/SmtpAppender.cs Mon Mar 16 16:41:25 2009
@@ -445,28 +445,30 @@
 				smtpClient.Credentials = System.Net.CredentialCache.DefaultNetworkCredentials;
 			}
 
-			MailMessage mailMessage = new MailMessage();
-			mailMessage.Body = messageBody;
-			mailMessage.From = new MailAddress(m_from);
-			mailMessage.To.Add(m_to);
-            if (!String.IsNullOrEmpty(m_cc))
+            using (MailMessage mailMessage = new MailMessage())
             {
-                mailMessage.CC.Add(m_cc);
-            }
-            if (!String.IsNullOrEmpty(m_bcc))
-            {
-                mailMessage.Bcc.Add(m_bcc);
-            }
-            if (!String.IsNullOrEmpty(m_replyTo))
-            {
-                mailMessage.ReplyTo = new MailAddress(m_replyTo);
-            }
-		    mailMessage.Subject = m_subject;
-			mailMessage.Priority = m_mailPriority;
+                mailMessage.Body = messageBody;
+                mailMessage.From = new MailAddress(m_from);
+                mailMessage.To.Add(m_to);
+                if (!String.IsNullOrEmpty(m_cc))
+                {
+                    mailMessage.CC.Add(m_cc);
+                }
+                if (!String.IsNullOrEmpty(m_bcc))
+                {
+                    mailMessage.Bcc.Add(m_bcc);
+                }
+                if (!String.IsNullOrEmpty(m_replyTo))
+                {
+                    mailMessage.ReplyTo = new MailAddress(m_replyTo);
+                }
+                mailMessage.Subject = m_subject;
+                mailMessage.Priority = m_mailPriority;
 
-			// TODO: Consider using SendAsync to send the message without blocking. This would be a change in
-			// behaviour compared to .NET 1.x. We would need a SendCompletedCallback to log errors.
-			smtpClient.Send(mailMessage);
+                // TODO: Consider using SendAsync to send the message without blocking. This would be a change in
+                // behaviour compared to .NET 1.x. We would need a SendCompletedCallback to log errors.
+                smtpClient.Send(mailMessage);
+            }
 #else
 				// .NET 1.x uses the System.Web.Mail API for sending Mail