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 ni...@apache.org on 2004/11/12 23:31:25 UTC
cvs commit: logging-log4net/src/Layout PatternLayout.cs
nicko 2004/11/12 14:31:25
Modified: src/Core LoggingEvent.cs
src/Layout PatternLayout.cs
Log:
Renamed LoggingEvent.EventProperties to LoggingEvent.Properties. This is in line with the other properties layers and is also backwardly compatible as that is what it used to be called. If the properties have been cached then the combined properties are returned, otherwise just the event properties are returned.
Revision Changes Path
1.13 +16 -3 logging-log4net/src/Core/LoggingEvent.cs
Index: LoggingEvent.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Core/LoggingEvent.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- LoggingEvent.cs 26 Sep 2004 23:21:52 -0000 1.12
+++ LoggingEvent.cs 12 Nov 2004 22:31:25 -0000 1.13
@@ -805,7 +805,7 @@
}
/// <summary>
- /// Gets additional event specific properties.
+ /// Additional event specific properties.
/// </summary>
/// <value>
/// Additional event specific properties.
@@ -822,11 +822,24 @@
/// event properties) can be retrieved using <see cref="LookupProperty"/>
/// and <see cref="GetProperties"/>.
/// </para>
+ /// <para>
+ /// Once the properties have been fixed <see cref="Fix"/> this property
+ /// returns the combined cached properties. This ensures that updates to
+ /// this property are always reflected in the underlying storage. When
+ /// returning the combined properties there may be more keys in the
+ /// Dictionary than expected.
+ /// </para>
/// </remarks>
- public PropertiesDictionary EventProperties
+ public PropertiesDictionary Properties
{
get
{
+ // If we have cached properties then return that otherwise changes will be lost
+ if (m_data.Properties != null)
+ {
+ return m_data.Properties;
+ }
+
if (m_eventProperties == null)
{
m_eventProperties = new PropertiesDictionary();
@@ -1219,7 +1232,7 @@
/// <item>
/// <term>this events properties</term>
/// <description>
- /// This event has <see cref="EventProperties"/> that can be set. These
+ /// This event has <see cref="Properties"/> that can be set. These
/// properties are specific to this event only.
/// </description>
/// </item>
1.14 +1 -1 logging-log4net/src/Layout/PatternLayout.cs
Index: PatternLayout.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Layout/PatternLayout.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- PatternLayout.cs 19 Sep 2004 19:50:45 -0000 1.13
+++ PatternLayout.cs 12 Nov 2004 22:31:25 -0000 1.14
@@ -378,7 +378,7 @@
/// <item>
/// <term>the event properties</term>
/// <description>
- /// The event has <see cref="LoggingEvent.EventProperties"/> that can be set. These
+ /// The event has <see cref="LoggingEvent.Properties"/> that can be set. These
/// properties are specific to this event only.
/// </description>
/// </item>