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/11/13 22:02:34 UTC
svn commit: r1714267 - in /logging/log4net/trunk/src/Util: ./
ReadOnlyPropertiesDictionary.cs
Author: bodewig
Date: Fri Nov 13 21:02:34 2015
New Revision: 1714267
URL: http://svn.apache.org/viewvc?rev=1714267&view=rev
Log:
port fix for LOG4NET-462 from 1.3 branch
Modified:
logging/log4net/trunk/src/Util/ (props changed)
logging/log4net/trunk/src/Util/ReadOnlyPropertiesDictionary.cs
Propchange: logging/log4net/trunk/src/Util/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 13 21:02:34 2015
@@ -0,0 +1,4 @@
+/logging/log4net/branches/1.2.12/src/Util:1511686-1520870
+/logging/log4net/tags/1.2.13RC1/src/Util:1539445-1539920
+/logging/log4net/trunk/src/Util:1539083
+/logging/log4net/trunk/src/log4net/Util:1541408,1544744,1665915,1669884-1669885,1669887-1669888,1669935,1669954,1669998,1670018,1675705
Modified: logging/log4net/trunk/src/Util/ReadOnlyPropertiesDictionary.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Util/ReadOnlyPropertiesDictionary.cs?rev=1714267&r1=1714266&r2=1714267&view=diff
==============================================================================
--- logging/log4net/trunk/src/Util/ReadOnlyPropertiesDictionary.cs (original)
+++ logging/log4net/trunk/src/Util/ReadOnlyPropertiesDictionary.cs Fri Nov 13 21:02:34 2015
@@ -52,7 +52,7 @@ namespace log4net.Util
/// <summary>
/// The Hashtable used to store the properties data
/// </summary>
- private Hashtable m_hashtable = new Hashtable();
+ private readonly Hashtable m_hashtable = new Hashtable();
#endregion Private Instance Fields
@@ -210,7 +210,7 @@ namespace log4net.Util
#endif
public virtual void GetObjectData(SerializationInfo info, StreamingContext context)
{
- foreach(DictionaryEntry entry in InnerHashtable)
+ foreach(DictionaryEntry entry in InnerHashtable.Clone() as IDictionary)
{
string entryKey = entry.Key as string;
object entryValue = entry.Value;