You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by bo...@apache.org on 2015/08/23 16:49:06 UTC
svn commit: r1697186 - in /logging/log4net/branches/log4net-1.2.x/src: ./
Appender/SmtpAppender.cs
Author: bodewig
Date: Sun Aug 23 14:49:06 2015
New Revision: 1697186
URL: http://svn.apache.org/r1697186
Log:
merge fix for LOG4NET-457
Modified:
logging/log4net/branches/log4net-1.2.x/src/ (props changed)
logging/log4net/branches/log4net-1.2.x/src/Appender/SmtpAppender.cs
Propchange: logging/log4net/branches/log4net-1.2.x/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 23 14:49:06 2015
@@ -1,4 +1,4 @@
/logging/log4net/branches/1.2.12/src:1511686-1520870
/logging/log4net/tags/1.2.13RC1/src:1539445-1539920
/logging/log4net/trunk/src:1539083
-/logging/log4net/trunk/src/log4net:1541408,1544744
+/logging/log4net/trunk/src/log4net:1541408,1544744,1665915
Modified: logging/log4net/branches/log4net-1.2.x/src/Appender/SmtpAppender.cs
URL: http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/src/Appender/SmtpAppender.cs?rev=1697186&r1=1697185&r2=1697186&view=diff
==============================================================================
--- logging/log4net/branches/log4net-1.2.x/src/Appender/SmtpAppender.cs (original)
+++ logging/log4net/branches/log4net-1.2.x/src/Appender/SmtpAppender.cs Sun Aug 23 14:49:06 2015
@@ -111,7 +111,7 @@ namespace log4net.Appender
public string To
{
get { return m_to; }
- set { m_to = value; }
+ set { m_to = MaybeTrimSeparators(value); }
}
/// <summary>
@@ -137,7 +137,7 @@ namespace log4net.Appender
public string Cc
{
get { return m_cc; }
- set { m_cc = value; }
+ set { m_cc = MaybeTrimSeparators(value); }
}
/// <summary>
@@ -155,7 +155,7 @@ namespace log4net.Appender
public string Bcc
{
get { return m_bcc; }
- set { m_bcc = value; }
+ set { m_bcc = MaybeTrimSeparators(value); }
}
/// <summary>
@@ -646,7 +646,16 @@ namespace log4net.Appender
}
#endregion // SmtpAuthentication Enum
- }
+
+ private static readonly char[] ADDRESS_DELIMITERS = new char[] { ',', ';' };
+
+ /// <summary>
+ /// trims leading and trailing commas or semicolons
+ /// </summary>
+ private static string MaybeTrimSeparators(string s) {
+ return string.IsNullOrEmpty(s) ? s : s.Trim(ADDRESS_DELIMITERS);
+ }
+ }
}
#endif // !NETCF && !SSCLI