http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Core/LoggerManager.cs ---------------------------------------------------------------------- diff --git a/src/Core/LoggerManager.cs b/src/Core/LoggerManager.cs index 8ffaad2..f64c9a4 100644 --- a/src/Core/LoggerManager.cs +++ b/src/Core/LoggerManager.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -46,7 +46,7 @@ namespace log4net.Core /// lookup and create repositories. The selector can be set either programmatically using /// the <see cref="RepositorySelector"/> property, or by setting the <c>log4net.RepositorySelector</c> /// AppSetting in the applications config file to the fully qualified type name of the - /// selector to use. + /// selector to use. /// </para> /// </remarks> /// <author>Nicko Cadell</author> @@ -63,7 +63,7 @@ namespace log4net.Core /// Private constructor to prevent instances. Only static methods should be used. /// </para> /// </remarks> - private LoggerManager() + private LoggerManager() { } @@ -76,8 +76,8 @@ namespace log4net.Core /// </summary> /// <remarks> /// <para> - /// On the full .NET runtime, the static constructor hooks up the - /// <c>AppDomain.ProcessExit</c> and <c>AppDomain.DomainUnload</c>> events. + /// On the full .NET runtime, the static constructor hooks up the + /// <c>AppDomain.ProcessExit</c> and <c>AppDomain.DomainUnload</c>> events. /// These are used to shutdown the log4net system as the application exits. /// </para> /// </remarks> @@ -145,7 +145,7 @@ namespace log4net.Core } } #endif - // Create the DefaultRepositorySelector if not configured above + // Create the DefaultRepositorySelector if not configured above if (s_repositorySelector == null) { s_repositorySelector = new DefaultRepositorySelector(typeof(log4net.Repository.Hierarchy.Hierarchy)); @@ -262,7 +262,7 @@ namespace log4net.Core /// <c>null</c>. /// </para> /// </remarks> - public static ILogger Exists(string repository, string name) + public static ILogger Exists(string repository, string name) { if (repository == null) { @@ -291,7 +291,7 @@ namespace log4net.Core /// <c>null</c>. /// </para> /// </remarks> - public static ILogger Exists(Assembly repositoryAssembly, string name) + public static ILogger Exists(Assembly repositoryAssembly, string name) { if (repositoryAssembly == null) { @@ -404,7 +404,7 @@ namespace log4net.Core throw new ArgumentNullException("name"); } return RepositorySelector.GetRepository(repositoryAssembly).GetLogger(name); - } + } /// <summary> /// Shorthand for <see cref="M:LogManager.GetLogger(string)"/>. @@ -417,7 +417,7 @@ namespace log4net.Core /// Gets the logger for the fully qualified name of the type specified. /// </para> /// </remarks> - public static ILogger GetLogger(string repository, Type type) + public static ILogger GetLogger(string repository, Type type) { if (repository == null) { @@ -441,7 +441,7 @@ namespace log4net.Core /// Gets the logger for the fully qualified name of the type specified. /// </para> /// </remarks> - public static ILogger GetLogger(Assembly repositoryAssembly, Type type) + public static ILogger GetLogger(Assembly repositoryAssembly, Type type) { if (repositoryAssembly == null) { @@ -452,7 +452,7 @@ namespace log4net.Core throw new ArgumentNullException("type"); } return RepositorySelector.GetRepository(repositoryAssembly).GetLogger(type.FullName); - } + } /// <summary> /// Shuts down the log4net system. @@ -464,7 +464,7 @@ namespace log4net.Core /// default repositories. /// </para> /// <para> - /// Some appenders need to be closed before the application exists. + /// Some appenders need to be closed before the application exists. /// Otherwise, pending logging events might be lost. /// </para> /// <para> @@ -474,7 +474,7 @@ namespace log4net.Core /// and again to a nested appender. /// </para> /// </remarks> - public static void Shutdown() + public static void Shutdown() { foreach(ILoggerRepository repository in GetAllRepositories()) { @@ -493,7 +493,7 @@ namespace log4net.Core /// repository for the <paramref name="repository"/> specified. /// </para> /// <para> - /// Some appenders need to be closed before the application exists. + /// Some appenders need to be closed before the application exists. /// Otherwise, pending logging events might be lost. /// </para> /// <para> @@ -503,7 +503,7 @@ namespace log4net.Core /// and again to a nested appender. /// </para> /// </remarks> - public static void ShutdownRepository(string repository) + public static void ShutdownRepository(string repository) { if (repository == null) { @@ -524,7 +524,7 @@ namespace log4net.Core /// the <paramref name="repositoryAssembly"/> specified. /// </para> /// <para> - /// Some appenders need to be closed before the application exists. + /// Some appenders need to be closed before the application exists. /// Otherwise, pending logging events might be lost. /// </para> /// <para> @@ -534,7 +534,7 @@ namespace log4net.Core /// and again to a nested appender. /// </para> /// </remarks> - public static void ShutdownRepository(Assembly repositoryAssembly) + public static void ShutdownRepository(Assembly repositoryAssembly) { if (repositoryAssembly == null) { @@ -555,9 +555,9 @@ namespace log4net.Core /// sets their additivity flag to <c>true</c> and sets the level /// of the root logger to <see cref="Level.Debug"/>. Moreover, /// message disabling is set its default "off" value. - /// </para> + /// </para> /// </remarks> - public static void ResetConfiguration(string repository) + public static void ResetConfiguration(string repository) { if (repository == null) { @@ -578,9 +578,9 @@ namespace log4net.Core /// sets their additivity flag to <c>true</c> and sets the level /// of the root logger to <see cref="Level.Debug"/>. Moreover, /// message disabling is set its default "off" value. - /// </para> + /// </para> /// </remarks> - public static void ResetConfiguration(Assembly repositoryAssembly) + public static void ResetConfiguration(Assembly repositoryAssembly) { if (repositoryAssembly == null) { @@ -765,13 +765,13 @@ namespace log4net.Core /// </value> /// <remarks> /// <para> - /// The repository selector (<see cref="IRepositorySelector"/>) is used by - /// the <see cref="LogManager"/> to create and select repositories + /// The repository selector (<see cref="IRepositorySelector"/>) is used by + /// the <see cref="LogManager"/> to create and select repositories /// (<see cref="ILoggerRepository"/>). /// </para> /// <para> - /// The caller to <see cref="LogManager"/> supplies either a string name - /// or an assembly (if not supplied the assembly is inferred using + /// The caller to <see cref="LogManager"/> supplies either a string name + /// or an assembly (if not supplied the assembly is inferred using /// <see cref="M:Assembly.GetCallingAssembly()"/>). /// </para> /// <para>
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Core/LoggerWrapperImpl.cs ---------------------------------------------------------------------- diff --git a/src/Core/LoggerWrapperImpl.cs b/src/Core/LoggerWrapperImpl.cs index fff496d..811648d 100644 --- a/src/Core/LoggerWrapperImpl.cs +++ b/src/Core/LoggerWrapperImpl.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -42,7 +42,7 @@ namespace log4net.Core /// Constructs a new wrapper for the specified logger. /// </para> /// </remarks> - protected LoggerWrapperImpl(ILogger logger) + protected LoggerWrapperImpl(ILogger logger) { m_logger = logger; } @@ -59,7 +59,7 @@ namespace log4net.Core /// </value> /// <remarks> /// <para> - /// The <c>Logger</c> object may not be the same object as this object + /// The <c>Logger</c> object may not be the same object as this object /// because of logger decorators. /// </para> /// <para> @@ -79,8 +79,8 @@ namespace log4net.Core /// <summary> /// The logger that this object is wrapping /// </summary> - private readonly ILogger m_logger; - + private readonly ILogger m_logger; + #endregion Private Instance Fields } } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Core/LoggingEvent.cs ---------------------------------------------------------------------- diff --git a/src/Core/LoggingEvent.cs b/src/Core/LoggingEvent.cs index eb54a60..1b872d5 100644 --- a/src/Core/LoggingEvent.cs +++ b/src/Core/LoggingEvent.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -111,7 +111,7 @@ namespace log4net.Core { get { - if (TimeStamp != default(DateTime) && + if (TimeStamp != default(DateTime) && _timeStampUtc == default(DateTime)) { // TimeStamp field has been set explicitly but TimeStampUtc hasn't @@ -296,12 +296,12 @@ namespace log4net.Core } /// <summary> - /// The internal representation of logging events. + /// The internal representation of logging events. /// </summary> /// <remarks> /// <para> - /// When an affirmative decision is made to log then a - /// <see cref="LoggingEvent"/> instance is created. This instance + /// When an affirmative decision is made to log then a + /// <see cref="LoggingEvent"/> instance is created. This instance /// is passed around to the different log4net components. /// </para> /// <para> @@ -325,7 +325,7 @@ namespace log4net.Core #if !NETCF [Serializable] #endif - public class LoggingEvent + public class LoggingEvent #if !NETCF : ISerializable #endif @@ -347,7 +347,7 @@ namespace log4net.Core /// <param name="exception">The exception for this event.</param> /// <remarks> /// <para> - /// Except <see cref="TimeStamp"/>, <see cref="Level"/> and <see cref="LoggerName"/>, + /// Except <see cref="TimeStamp"/>, <see cref="Level"/> and <see cref="LoggerName"/>, /// all fields of <c>LoggingEvent</c> are filled when actually needed. Call /// <see cref="M:FixVolatileData()"/> to cache all data locally /// to prevent inconsistencies. @@ -356,7 +356,7 @@ namespace log4net.Core /// to create a logging event. /// </para> /// </remarks> - public LoggingEvent(Type callerStackBoundaryDeclaringType, log4net.Repository.ILoggerRepository repository, string loggerName, Level level, object message, Exception exception) + public LoggingEvent(Type callerStackBoundaryDeclaringType, log4net.Repository.ILoggerRepository repository, string loggerName, Level level, object message, Exception exception) { m_callerStackBoundaryDeclaringType = callerStackBoundaryDeclaringType; m_message = message; @@ -371,7 +371,7 @@ namespace log4net.Core } /// <summary> - /// Initializes a new instance of the <see cref="LoggingEvent" /> class + /// Initializes a new instance of the <see cref="LoggingEvent" /> class /// using specific data. /// </summary> /// <param name="callerStackBoundaryDeclaringType">The declaring type of the method that is @@ -386,7 +386,7 @@ namespace log4net.Core /// be useful if you require a custom serialization scheme. /// </para> /// <para> - /// Use the <see cref="M:GetLoggingEventData(FixFlags)"/> method to obtain an + /// Use the <see cref="M:GetLoggingEventData(FixFlags)"/> method to obtain an /// instance of the <see cref="LoggingEventData"/> class. /// </para> /// <para> @@ -395,7 +395,7 @@ namespace log4net.Core /// will be captured from the environment if requested or fixed. /// </para> /// </remarks> - public LoggingEvent(Type callerStackBoundaryDeclaringType, log4net.Repository.ILoggerRepository repository, LoggingEventData data, FixFlags fixedData) + public LoggingEvent(Type callerStackBoundaryDeclaringType, log4net.Repository.ILoggerRepository repository, LoggingEventData data, FixFlags fixedData) { m_callerStackBoundaryDeclaringType = callerStackBoundaryDeclaringType; m_repository = repository; @@ -405,7 +405,7 @@ namespace log4net.Core } /// <summary> - /// Initializes a new instance of the <see cref="LoggingEvent" /> class + /// Initializes a new instance of the <see cref="LoggingEvent" /> class /// using specific data. /// </summary> /// <param name="callerStackBoundaryDeclaringType">The declaring type of the method that is @@ -419,7 +419,7 @@ namespace log4net.Core /// be useful if you require a custom serialization scheme. /// </para> /// <para> - /// Use the <see cref="M:GetLoggingEventData(FixFlags)"/> method to obtain an + /// Use the <see cref="M:GetLoggingEventData(FixFlags)"/> method to obtain an /// instance of the <see cref="LoggingEventData"/> class. /// </para> /// <para> @@ -433,7 +433,7 @@ namespace log4net.Core } /// <summary> - /// Initializes a new instance of the <see cref="LoggingEvent" /> class + /// Initializes a new instance of the <see cref="LoggingEvent" /> class /// using specific data. /// </summary> /// <param name="data">Data used to initialize the logging event.</param> @@ -444,7 +444,7 @@ namespace log4net.Core /// be useful if you require a custom serialization scheme. /// </para> /// <para> - /// Use the <see cref="M:GetLoggingEventData(FixFlags)"/> method to obtain an + /// Use the <see cref="M:GetLoggingEventData(FixFlags)"/> method to obtain an /// instance of the <see cref="LoggingEventData"/> class. /// </para> /// <para> @@ -470,16 +470,16 @@ namespace log4net.Core /// <param name="context">The <see cref="StreamingContext" /> that contains contextual information about the source or destination.</param> /// <remarks> /// <para> - /// Initializes a new instance of the <see cref="LoggingEvent" /> class + /// Initializes a new instance of the <see cref="LoggingEvent" /> class /// with serialized data. /// </para> /// </remarks> - protected LoggingEvent(SerializationInfo info, StreamingContext context) + protected LoggingEvent(SerializationInfo info, StreamingContext context) { m_data.LoggerName = info.GetString("LoggerName"); // Note we are deserializing the whole level object. That is the - // name and the value. This value is correct for the source + // name and the value. This value is correct for the source // hierarchy but may not be for the target hierarchy that this // event may be re-logged into. If it is to be re-logged it may // be necessary to re-lookup the level based only on the name. @@ -505,7 +505,7 @@ namespace log4net.Core #endregion Protected Instance Constructors #region Public Instance Properties - + /// <summary> /// Gets the time when the current process started. /// </summary> @@ -568,7 +568,7 @@ namespace log4net.Core /// </remarks> public Level Level { - get { return m_data.Level; } + get { return m_data.Level; } } /// <summary> @@ -634,7 +634,7 @@ namespace log4net.Core { get { - if (m_data.LocationInfo == null && this.m_cacheUpdatable) + if (m_data.LocationInfo == null && this.m_cacheUpdatable) { m_data.LocationInfo = new LocationInfo(m_callerStackBoundaryDeclaringType); } @@ -652,9 +652,9 @@ namespace log4net.Core /// <para> /// Gets the message object used to initialize this event. /// Note that this event may not have a valid message object. - /// If the event is serialized the message object will not + /// If the event is serialized the message object will not /// be transferred. To get the text of the message the - /// <see cref="RenderedMessage"/> property must be used + /// <see cref="RenderedMessage"/> property must be used /// not this property. /// </para> /// <para> @@ -665,7 +665,7 @@ namespace log4net.Core public object MessageObject { get { return m_message; } - } + } /// <summary> /// Gets the exception object used to initialize this event. @@ -677,9 +677,9 @@ namespace log4net.Core /// <para> /// Gets the exception object used to initialize this event. /// Note that this event may not have a valid exception object. - /// If the event is serialized the exception object will not + /// If the event is serialized the exception object will not /// be transferred. To get the text of the exception the - /// <see cref="GetExceptionString"/> method must be used + /// <see cref="GetExceptionString"/> method must be used /// not this property. /// </para> /// <para> @@ -690,7 +690,7 @@ namespace log4net.Core public Exception ExceptionObject { get { return m_thrownException; } - } + } /// <summary> /// The <see cref="ILoggerRepository"/> that this event was created in. @@ -730,8 +730,8 @@ namespace log4net.Core /// </remarks> public string RenderedMessage { - get - { + get + { if (m_data.Message == null && this.m_cacheUpdatable) { if (m_message == null) @@ -752,7 +752,7 @@ namespace log4net.Core m_data.Message = m_message.ToString(); } } - return m_data.Message; + return m_data.Message; } } @@ -763,7 +763,7 @@ namespace log4net.Core /// <remarks> /// <para> /// Unlike the <see cref="RenderedMessage"/> property this method - /// does store the message data in the internal cache. Therefore + /// does store the message data in the internal cache. Therefore /// if called only once this method should be faster than the /// <see cref="RenderedMessage"/> property, however if the message is /// to be accessed multiple times then the property will be more efficient. @@ -773,7 +773,7 @@ namespace log4net.Core { if (m_data.Message != null) { - writer.Write(m_data.Message); + writer.Write(m_data.Message); } else { @@ -797,10 +797,10 @@ namespace log4net.Core } /// <summary> - /// Gets the name of the current thread. + /// Gets the name of the current thread. /// </summary> /// <value> - /// The name of the current thread, or the thread ID when + /// The name of the current thread, or the thread ID when /// the name is not available. /// </value> /// <remarks> @@ -822,7 +822,7 @@ namespace log4net.Core if (m_data.ThreadName == null || m_data.ThreadName.Length == 0) { // The thread name is not available. Therefore we - // go the the AppDomain to get the ID of the + // go the the AppDomain to get the ID of the // current thread. (Why don't Threads know their own ID?) try { @@ -830,7 +830,7 @@ namespace log4net.Core } catch(System.Security.SecurityException) { - // This security exception will occur if the caller does not have + // This security exception will occur if the caller does not have // some undefined set of SecurityPermission flags. LogLog.Debug(declaringType, "Security exception while trying to get current thread ID. Error Ignored. Empty thread name."); @@ -848,8 +848,8 @@ namespace log4net.Core /// Gets the name of the current user. /// </summary> /// <value> - /// The name of the current user, or <c>NOT AVAILABLE</c> when the - /// underlying runtime has no support for retrieving the name of the + /// The name of the current user, or <c>NOT AVAILABLE</c> when the + /// underlying runtime has no support for retrieving the name of the /// current user. /// </value> /// <remarks> @@ -858,14 +858,14 @@ namespace log4net.Core /// the current windows user. /// </para> /// <para> - /// To improve performance, we could cache the string representation of - /// the name, and reuse that as long as the identity stayed constant. - /// Once the identity changed, we would need to re-assign and re-render + /// To improve performance, we could cache the string representation of + /// the name, and reuse that as long as the identity stayed constant. + /// Once the identity changed, we would need to re-assign and re-render /// the string. /// </para> /// <para> - /// However, the <c>WindowsIdentity.GetCurrent()</c> call seems to - /// return different objects every time, so the current implementation + /// However, the <c>WindowsIdentity.GetCurrent()</c> call seems to + /// return different objects every time, so the current implementation /// doesn't do this type of caching. /// </para> /// <para> @@ -886,8 +886,8 @@ namespace log4net.Core /// </item> /// </list> /// <para> - /// This means we could speed things up almost 40 times by caching the - /// value of the <c>WindowsIdentity.GetCurrent().Name</c> property, since + /// This means we could speed things up almost 40 times by caching the + /// value of the <c>WindowsIdentity.GetCurrent().Name</c> property, since /// this takes (8.04-0.20) = 7.84375 seconds. /// </para> /// </remarks> @@ -895,7 +895,7 @@ namespace log4net.Core { get { - if (m_data.UserName == null && this.m_cacheUpdatable) + if (m_data.UserName == null && this.m_cacheUpdatable) { #if (NETCF || SSCLI || NETSTANDARD1_3) // NETSTANDARD1_3 TODO requires platform-specific code // On compact framework there's no notion of current Windows user @@ -915,7 +915,7 @@ namespace log4net.Core } catch(System.Security.SecurityException) { - // This security exception will occur if the caller does not have + // This security exception will occur if the caller does not have // some undefined set of SecurityPermission flags. LogLog.Debug(declaringType, "Security exception while trying to get current windows identity. Error Ignored. Empty user name."); @@ -951,7 +951,7 @@ namespace log4net.Core #else try { - if (System.Threading.Thread.CurrentPrincipal != null && + if (System.Threading.Thread.CurrentPrincipal != null && System.Threading.Thread.CurrentPrincipal.Identity != null && System.Threading.Thread.CurrentPrincipal.Identity.Name != null) { @@ -973,7 +973,7 @@ namespace log4net.Core } catch (System.Security.SecurityException) { - // This security exception will occur if the caller does not have + // This security exception will occur if the caller does not have // some undefined set of SecurityPermission flags. LogLog.Debug(declaringType, "Security exception while trying to get current thread principal. Error Ignored. Empty identity name."); @@ -998,13 +998,13 @@ namespace log4net.Core /// </remarks> public string Domain { - get - { + get + { if (m_data.Domain == null && this.m_cacheUpdatable) { m_data.Domain = SystemInfo.ApplicationFriendlyName; } - return m_data.Domain; + return m_data.Domain; } } @@ -1036,8 +1036,8 @@ namespace log4net.Core /// </remarks> public PropertiesDictionary Properties { - get - { + get + { // If we have cached properties then return that otherwise changes will be lost if (m_data.Properties != null) { @@ -1048,7 +1048,7 @@ namespace log4net.Core { m_eventProperties = new PropertiesDictionary(); } - return m_eventProperties; + return m_eventProperties; } } @@ -1087,7 +1087,7 @@ namespace log4net.Core /// </para> /// <para> /// The <see cref="M:FixVolatileData()"/> method must be called during the - /// <see cref="log4net.Appender.IAppender.DoAppend"/> method call if this event + /// <see cref="log4net.Appender.IAppender.DoAppend"/> method call if this event /// is to be used outside that method. /// </para> /// </remarks> @@ -1162,7 +1162,7 @@ namespace log4net.Core } /// <summary> - /// Returns this event's exception's rendered using the + /// Returns this event's exception's rendered using the /// <see cref="ILoggerRepository.RendererMap" />. /// </summary> /// <returns> @@ -1174,13 +1174,13 @@ namespace log4net.Core /// </para> /// </remarks> [Obsolete("Use GetExceptionString instead")] - public string GetExceptionStrRep() + public string GetExceptionStrRep() { return GetExceptionString(); } /// <summary> - /// Returns this event's exception's rendered using the + /// Returns this event's exception's rendered using the /// <see cref="ILoggerRepository.RendererMap" />. /// </summary> /// <returns> @@ -1188,11 +1188,11 @@ namespace log4net.Core /// </returns> /// <remarks> /// <para> - /// Returns this event's exception's rendered using the + /// Returns this event's exception's rendered using the /// <see cref="ILoggerRepository.RendererMap" />. /// </para> /// </remarks> - public string GetExceptionString() + public string GetExceptionString() { if (m_data.ExceptionString == null && this.m_cacheUpdatable) { @@ -1264,14 +1264,14 @@ namespace log4net.Core /// </para> /// <para> /// The <paramref name="fastButLoose"/> param controls the data that - /// is fixed. Some of the data that can be fixed takes a long time to + /// is fixed. Some of the data that can be fixed takes a long time to /// generate, therefore if you do not require those settings to be fixed /// they can be ignored by setting the <paramref name="fastButLoose"/> param /// to <c>true</c>. This setting will ignore the <see cref="LocationInformation"/> /// and <see cref="UserName"/> settings. /// </para> /// <para> - /// Set <paramref name="fastButLoose"/> to <c>false</c> to ensure that all + /// Set <paramref name="fastButLoose"/> to <c>false</c> to ensure that all /// settings are fixed. /// </para> /// </remarks> @@ -1305,13 +1305,13 @@ namespace log4net.Core //Unlock the cache so that new values can be stored //This may not be ideal if we are no longer in the correct context - //and someone calls fix. + //and someone calls fix. m_cacheUpdatable=true; // determine the flags that we are actually fixing FixFlags updateFlags = (FixFlags)((flags ^ m_fixFlags) & flags); - if (updateFlags > 0) + if (updateFlags > 0) { if ((updateFlags & FixFlags.Message) != 0) { @@ -1374,7 +1374,7 @@ namespace log4net.Core } // avoid warning CS0219 - if (forceCreation != null) + if (forceCreation != null) { } @@ -1473,7 +1473,7 @@ namespace log4net.Core /// <item> /// <term>this events properties</term> /// <description> - /// This event has <see cref="Properties"/> 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> @@ -1487,7 +1487,7 @@ namespace log4net.Core /// <item> /// <term>the global properties</term> /// <description> - /// The <see cref="GlobalContext.Properties"/> that are set globally. These + /// The <see cref="GlobalContext.Properties"/> that are set globally. These /// properties are shared by all the threads in the AppDomain. /// </description> /// </item> @@ -1513,7 +1513,7 @@ namespace log4net.Core /// <returns>the <see cref="PropertiesDictionary"/> containing all the properties</returns> /// <remarks> /// <para> - /// See <see cref="LookupProperty"/> for details of the composite properties + /// See <see cref="LookupProperty"/> for details of the composite properties /// stored by the event. /// </para> /// <para> @@ -1554,7 +1554,7 @@ namespace log4net.Core private PropertiesDictionary m_eventProperties; /// <summary> - /// The fully qualified Type of the calling + /// The fully qualified Type of the calling /// logger class in the stack frame (i.e. the declaring type of the method). /// </summary> private readonly Type m_callerStackBoundaryDeclaringType; http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Core/MethodItem.cs ---------------------------------------------------------------------- diff --git a/src/Core/MethodItem.cs b/src/Core/MethodItem.cs index b03b722..cc719fa 100644 --- a/src/Core/MethodItem.cs +++ b/src/Core/MethodItem.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -28,7 +28,7 @@ namespace log4net.Core /// provides method information without actually referencing a System.Reflection.MethodBase /// as that would require that the containing assembly is loaded. /// </summary> - /// + /// #if !NETCF [Serializable] #endif @@ -102,16 +102,16 @@ namespace log4net.Core #region Public Instance Properties /// <summary> - /// Gets the method name of the caller making the logging + /// Gets the method name of the caller making the logging /// request. /// </summary> /// <value> - /// The method name of the caller making the logging + /// The method name of the caller making the logging /// request. /// </value> /// <remarks> /// <para> - /// Gets the method name of the caller making the logging + /// Gets the method name of the caller making the logging /// request. /// </para> /// </remarks> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Core/SecurityContext.cs ---------------------------------------------------------------------- diff --git a/src/Core/SecurityContext.cs b/src/Core/SecurityContext.cs index fecad2b..80eba4d 100644 --- a/src/Core/SecurityContext.cs +++ b/src/Core/SecurityContext.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -44,7 +44,7 @@ namespace log4net.Core /// <para> /// Impersonate this security context. Further calls on the current /// thread should now be made in the security context provided - /// by this object. When the <see cref="IDisposable"/> result + /// by this object. When the <see cref="IDisposable"/> result /// <see cref="IDisposable.Dispose"/> method is called the security /// context of the thread should be reverted to the state it was in /// before <see cref="Impersonate"/> was called. http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Core/SecurityContextProvider.cs ---------------------------------------------------------------------- diff --git a/src/Core/SecurityContextProvider.cs b/src/Core/SecurityContextProvider.cs index f6e99e6..485c243 100644 --- a/src/Core/SecurityContextProvider.cs +++ b/src/Core/SecurityContextProvider.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -44,7 +44,7 @@ namespace log4net.Core /// This default behavior can be overridden by subclassing the <see cref="SecurityContextProvider"/> /// and overriding the <see cref="CreateSecurityContext"/> method to return /// the desired <see cref="SecurityContext"/> objects. The default provider - /// can be replaced by programmatically setting the value of the + /// can be replaced by programmatically setting the value of the /// <see cref="SecurityContextProvider.DefaultProvider"/> property. /// </para> /// <para> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Core/StackFrameItem.cs ---------------------------------------------------------------------- diff --git a/src/Core/StackFrameItem.cs b/src/Core/StackFrameItem.cs index 3f6c16b..8de50a4 100644 --- a/src/Core/StackFrameItem.cs +++ b/src/Core/StackFrameItem.cs @@ -1,11 +1,11 @@ #if !NETCF #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -29,14 +29,14 @@ namespace log4net.Core /// provides stack frame information without actually referencing a System.Diagnostics.StackFrame /// as that would require that the containing assembly is loaded. /// </summary> - /// + /// [Serializable] public class StackFrameItem { #region Public Instance Constructors /// <summary> - /// returns a stack frame item from a stack frame. This + /// returns a stack frame item from a stack frame. This /// </summary> /// <param name="frame"></param> /// <returns></returns> @@ -76,16 +76,16 @@ namespace log4net.Core #region Public Instance Properties /// <summary> - /// Gets the fully qualified class name of the caller making the logging + /// Gets the fully qualified class name of the caller making the logging /// request. /// </summary> /// <value> - /// The fully qualified class name of the caller making the logging + /// The fully qualified class name of the caller making the logging /// request. /// </value> /// <remarks> /// <para> - /// Gets the fully qualified class name of the caller making the logging + /// Gets the fully qualified class name of the caller making the logging /// request. /// </para> /// </remarks> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Core/TimeEvaluator.cs ---------------------------------------------------------------------- diff --git a/src/Core/TimeEvaluator.cs b/src/Core/TimeEvaluator.cs index 3067f56..4e8593a 100644 --- a/src/Core/TimeEvaluator.cs +++ b/src/Core/TimeEvaluator.cs @@ -1,10 +1,10 @@ #region Copyright & License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -26,7 +26,7 @@ namespace log4net.Core /// </summary> /// <remarks> /// <para> - /// This evaluator will trigger if the specified time period + /// This evaluator will trigger if the specified time period /// <see cref="Interval"/> has passed since last check. /// </para> /// </remarks> @@ -56,7 +56,7 @@ namespace log4net.Core /// Create a new evaluator using the <see cref="DEFAULT_INTERVAL"/> time threshold in seconds. /// </para> /// <para> - /// This evaluator will trigger if the specified time period + /// This evaluator will trigger if the specified time period /// <see cref="Interval"/> has passed since last check. /// </para> /// </remarks> @@ -77,7 +77,7 @@ namespace log4net.Core /// Create a new evaluator using the specified time threshold in seconds. /// </para> /// <para> - /// This evaluator will trigger if the specified time period + /// This evaluator will trigger if the specified time period /// <see cref="Interval"/> has passed since last check. /// </para> /// </remarks> @@ -96,7 +96,7 @@ namespace log4net.Core /// </value> /// <remarks> /// <para> - /// This evaluator will trigger if the specified time period + /// This evaluator will trigger if the specified time period /// <see cref="Interval"/> has passed since last check. /// </para> /// </remarks> @@ -110,12 +110,12 @@ namespace log4net.Core /// Is this <paramref name="loggingEvent"/> the triggering event? /// </summary> /// <param name="loggingEvent">The event to check</param> - /// <returns>This method returns <c>true</c>, if the specified time period - /// <see cref="Interval"/> has passed since last check.. + /// <returns>This method returns <c>true</c>, if the specified time period + /// <see cref="Interval"/> has passed since last check.. /// Otherwise it returns <c>false</c></returns> /// <remarks> /// <para> - /// This evaluator will trigger if the specified time period + /// This evaluator will trigger if the specified time period /// <see cref="Interval"/> has passed since last check. /// </para> /// </remarks> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Core/WrapperMap.cs ---------------------------------------------------------------------- diff --git a/src/Core/WrapperMap.cs b/src/Core/WrapperMap.cs index a43a8b8..920390f 100644 --- a/src/Core/WrapperMap.cs +++ b/src/Core/WrapperMap.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -51,7 +51,7 @@ namespace log4net.Core /// <remarks> /// <para> /// This class maintains a mapping between <see cref="ILogger"/> objects and - /// <see cref="ILoggerWrapper"/> objects. Use the <see cref="GetWrapper"/> method to + /// <see cref="ILoggerWrapper"/> objects. Use the <see cref="GetWrapper"/> method to /// lookup the <see cref="ILoggerWrapper"/> for the specified <see cref="ILogger"/>. /// </para> /// <para> @@ -74,11 +74,11 @@ namespace log4net.Core /// <param name="createWrapperHandler">The handler to use to create the wrapper objects.</param> /// <remarks> /// <para> - /// Initializes a new instance of the <see cref="WrapperMap" /> class with + /// Initializes a new instance of the <see cref="WrapperMap" /> class with /// the specified handler to create the wrapper objects. /// </para> /// </remarks> - public WrapperMap(WrapperCreationHandler createWrapperHandler) + public WrapperMap(WrapperCreationHandler createWrapperHandler) { m_createWrapperHandler = createWrapperHandler; @@ -139,7 +139,7 @@ namespace log4net.Core // Create a new wrapper wrapping the logger wrapperObject = CreateNewWrapperObject(logger); - + // Store wrapper logger in map wrappersMap[logger] = wrapperObject; } @@ -165,7 +165,7 @@ namespace log4net.Core /// value being the corresponding <see cref="ILoggerWrapper"/>. /// </para> /// </remarks> - protected Hashtable Repositories + protected Hashtable Repositories { get { return this.m_repositories; } } @@ -253,7 +253,7 @@ namespace log4net.Core /// Internal reference to the delegate used to register for repository shutdown events. /// </summary> private readonly LoggerRepositoryShutdownEventHandler m_shutdownHandler; - + #endregion Private Instance Variables } } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/DateFormatter/AbsoluteTimeDateFormatter.cs ---------------------------------------------------------------------- diff --git a/src/DateFormatter/AbsoluteTimeDateFormatter.cs b/src/DateFormatter/AbsoluteTimeDateFormatter.cs index 1174107..b035f73 100644 --- a/src/DateFormatter/AbsoluteTimeDateFormatter.cs +++ b/src/DateFormatter/AbsoluteTimeDateFormatter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -54,7 +54,7 @@ namespace log4net.DateFormatter virtual protected void FormatDateWithoutMillis(DateTime dateToFormat, StringBuilder buffer) { int hour = dateToFormat.Hour; - if (hour < 10) + if (hour < 10) { buffer.Append('0'); } @@ -62,15 +62,15 @@ namespace log4net.DateFormatter buffer.Append(':'); int mins = dateToFormat.Minute; - if (mins < 10) + if (mins < 10) { buffer.Append('0'); } buffer.Append(mins); buffer.Append(':'); - + int secs = dateToFormat.Second; - if (secs < 10) + if (secs < 10) { buffer.Append('0'); } @@ -152,15 +152,15 @@ namespace log4net.DateFormatter } } writer.Write(timeString); - + // Append the current millisecond info writer.Write(','); int millis = dateToFormat.Millisecond; - if (millis < 100) + if (millis < 100) { writer.Write('0'); } - if (millis < 10) + if (millis < 10) { writer.Write('0'); } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/DateFormatter/DateTimeDateFormatter.cs ---------------------------------------------------------------------- diff --git a/src/DateFormatter/DateTimeDateFormatter.cs b/src/DateFormatter/DateTimeDateFormatter.cs index 03dcca9..dbc7eb1 100644 --- a/src/DateFormatter/DateTimeDateFormatter.cs +++ b/src/DateFormatter/DateTimeDateFormatter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -28,8 +28,8 @@ namespace log4net.DateFormatter /// </summary> /// <remarks> /// <para> - /// Formats a <see cref="DateTime"/> in the format - /// <c>"dd MMM yyyy HH:mm:ss,fff"</c> for example, + /// Formats a <see cref="DateTime"/> in the format + /// <c>"dd MMM yyyy HH:mm:ss,fff"</c> for example, /// <c>"06 Nov 1994 15:49:37,459"</c>. /// </para> /// </remarks> @@ -75,15 +75,15 @@ namespace log4net.DateFormatter override protected void FormatDateWithoutMillis(DateTime dateToFormat, StringBuilder buffer) { int day = dateToFormat.Day; - if (day < 10) + if (day < 10) { buffer.Append('0'); } buffer.Append(day); - buffer.Append(' '); + buffer.Append(' '); buffer.Append(m_dateTimeFormatInfo.GetAbbreviatedMonthName(dateToFormat.Month)); - buffer.Append(' '); + buffer.Append(' '); buffer.Append(dateToFormat.Year); buffer.Append(' '); http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/DateFormatter/IDateFormatter.cs ---------------------------------------------------------------------- diff --git a/src/DateFormatter/IDateFormatter.cs b/src/DateFormatter/IDateFormatter.cs index f5074ee..d80dba1 100644 --- a/src/DateFormatter/IDateFormatter.cs +++ b/src/DateFormatter/IDateFormatter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/DateFormatter/Iso8601DateFormatter.cs ---------------------------------------------------------------------- diff --git a/src/DateFormatter/Iso8601DateFormatter.cs b/src/DateFormatter/Iso8601DateFormatter.cs index a7e88d5..b152d9d 100644 --- a/src/DateFormatter/Iso8601DateFormatter.cs +++ b/src/DateFormatter/Iso8601DateFormatter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -80,7 +80,7 @@ namespace log4net.DateFormatter buffer.Append('-'); int day = dateToFormat.Day; - if (day < 10) + if (day < 10) { buffer.Append('0'); } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/DateFormatter/SimpleDateFormatter.cs ---------------------------------------------------------------------- diff --git a/src/DateFormatter/SimpleDateFormatter.cs b/src/DateFormatter/SimpleDateFormatter.cs index c112ca1..e6fefdf 100644 --- a/src/DateFormatter/SimpleDateFormatter.cs +++ b/src/DateFormatter/SimpleDateFormatter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -42,7 +42,7 @@ namespace log4net.DateFormatter /// <param name="format">The format string.</param> /// <remarks> /// <para> - /// Initializes a new instance of the <see cref="SimpleDateFormatter" /> class + /// Initializes a new instance of the <see cref="SimpleDateFormatter" /> class /// with the specified format string. /// </para> /// <para> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Filter/DenyAllFilter.cs ---------------------------------------------------------------------- diff --git a/src/Filter/DenyAllFilter.cs b/src/Filter/DenyAllFilter.cs index e17a16f..2c3b169 100644 --- a/src/Filter/DenyAllFilter.cs +++ b/src/Filter/DenyAllFilter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -24,7 +24,7 @@ using log4net.Core; namespace log4net.Filter { /// <summary> - /// This filter drops all <see cref="LoggingEvent"/>. + /// This filter drops all <see cref="LoggingEvent"/>. /// </summary> /// <remarks> /// <para> @@ -65,7 +65,7 @@ namespace log4net.Filter /// as any further filters will be ignored! /// </para> /// </remarks> - override public FilterDecision Decide(LoggingEvent loggingEvent) + override public FilterDecision Decide(LoggingEvent loggingEvent) { return FilterDecision.Deny; } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Filter/FilterDecision.cs ---------------------------------------------------------------------- diff --git a/src/Filter/FilterDecision.cs b/src/Filter/FilterDecision.cs index 1b5967b..975ba2a 100644 --- a/src/Filter/FilterDecision.cs +++ b/src/Filter/FilterDecision.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -34,19 +34,19 @@ namespace log4net.Filter public enum FilterDecision : int { /// <summary> - /// The log event must be dropped immediately without + /// The log event must be dropped immediately without /// consulting with the remaining filters, if any, in the chain. /// </summary> Deny = -1, - + /// <summary> - /// This filter is neutral with respect to the log event. + /// This filter is neutral with respect to the log event. /// The remaining filters, if any, should be consulted for a final decision. /// </summary> Neutral = 0, /// <summary> - /// The log event must be logged immediately without + /// The log event must be logged immediately without /// consulting with the remaining filters, if any, in the chain. /// </summary> Accept = 1, http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Filter/FilterSkeleton.cs ---------------------------------------------------------------------- diff --git a/src/Filter/FilterSkeleton.cs b/src/Filter/FilterSkeleton.cs index 9cc24d8..2a1b918 100644 --- a/src/Filter/FilterSkeleton.cs +++ b/src/Filter/FilterSkeleton.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -28,7 +28,7 @@ namespace log4net.Filter /// <remarks> /// <para> /// Users should extend this class to implement customized logging - /// event filtering. Note that <see cref="log4net.Repository.Hierarchy.Logger"/> and + /// event filtering. Note that <see cref="log4net.Repository.Hierarchy.Logger"/> and /// <see cref="log4net.Appender.AppenderSkeleton"/>, the parent class of all standard /// appenders, have built-in filtering rules. It is suggested that you /// first use and understand the built-in rules before rushing to write @@ -37,16 +37,16 @@ namespace log4net.Filter /// <para> /// This abstract class assumes and also imposes that filters be /// organized in a linear chain. The <see cref="Decide"/> - /// method of each filter is called sequentially, in the order of their + /// method of each filter is called sequentially, in the order of their /// addition to the chain. /// </para> /// <para> /// The <see cref="Decide"/> method must return one - /// of the integer constants <see cref="FilterDecision.Deny"/>, + /// of the integer constants <see cref="FilterDecision.Deny"/>, /// <see cref="FilterDecision.Neutral"/> or <see cref="FilterDecision.Accept"/>. /// </para> /// <para> - /// If the value <see cref="FilterDecision.Deny"/> is returned, then the log event is dropped + /// If the value <see cref="FilterDecision.Deny"/> is returned, then the log event is dropped /// immediately without consulting with the remaining filters. /// </para> /// <para> @@ -90,21 +90,21 @@ namespace log4net.Filter /// <remarks> /// <para> /// This is part of the <see cref="IOptionHandler"/> delayed object - /// activation scheme. The <see cref="ActivateOptions"/> method must + /// activation scheme. The <see cref="ActivateOptions"/> method must /// be called on this object after the configuration properties have /// been set. Until <see cref="ActivateOptions"/> is called this - /// object is in an undefined state and must not be used. + /// object is in an undefined state and must not be used. /// </para> /// <para> - /// If any of the configuration properties are modified then + /// If any of the configuration properties are modified then /// <see cref="ActivateOptions"/> must be called again. /// </para> /// <para> - /// Typically filter's options become active immediately on set, - /// however this method must still be called. + /// Typically filter's options become active immediately on set, + /// however this method must still be called. /// </para> /// </remarks> - virtual public void ActivateOptions() + virtual public void ActivateOptions() { } @@ -140,7 +140,7 @@ namespace log4net.Filter /// </value> /// <remarks> /// <para> - /// Filters are typically composed into chains. This property allows the next filter in + /// Filters are typically composed into chains. This property allows the next filter in /// the chain to be accessed. /// </para> /// </remarks> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Filter/IFilter.cs ---------------------------------------------------------------------- diff --git a/src/Filter/IFilter.cs b/src/Filter/IFilter.cs index 8c597a7..402ab67 100644 --- a/src/Filter/IFilter.cs +++ b/src/Filter/IFilter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -29,7 +29,7 @@ namespace log4net.Filter /// <remarks> /// <para> /// Users should implement this interface to implement customized logging - /// event filtering. Note that <see cref="log4net.Repository.Hierarchy.Logger"/> and + /// event filtering. Note that <see cref="log4net.Repository.Hierarchy.Logger"/> and /// <see cref="log4net.Appender.AppenderSkeleton"/>, the parent class of all standard /// appenders, have built-in filtering rules. It is suggested that you /// first use and understand the built-in rules before rushing to write @@ -38,16 +38,16 @@ namespace log4net.Filter /// <para> /// This abstract class assumes and also imposes that filters be /// organized in a linear chain. The <see cref="Decide"/> - /// method of each filter is called sequentially, in the order of their + /// method of each filter is called sequentially, in the order of their /// addition to the chain. /// </para> /// <para> /// The <see cref="Decide"/> method must return one - /// of the integer constants <see cref="FilterDecision.Deny"/>, + /// of the integer constants <see cref="FilterDecision.Deny"/>, /// <see cref="FilterDecision.Neutral"/> or <see cref="FilterDecision.Accept"/>. /// </para> /// <para> - /// If the value <see cref="FilterDecision.Deny"/> is returned, then the log event is dropped + /// If the value <see cref="FilterDecision.Deny"/> is returned, then the log event is dropped /// immediately without consulting with the remaining filters. /// </para> /// <para> @@ -93,7 +93,7 @@ namespace log4net.Filter /// </value> /// <remarks> /// <para> - /// Filters are typically composed into chains. This property allows the next filter in + /// Filters are typically composed into chains. This property allows the next filter in /// the chain to be accessed. /// </para> /// </remarks> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Filter/LevelMatchFilter.cs ---------------------------------------------------------------------- diff --git a/src/Filter/LevelMatchFilter.cs b/src/Filter/LevelMatchFilter.cs index 2d3465a..ed5a8d5 100644 --- a/src/Filter/LevelMatchFilter.cs +++ b/src/Filter/LevelMatchFilter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -32,10 +32,10 @@ namespace log4net.Filter /// <para> /// The filter admits two options <see cref="LevelToMatch"/> and /// <see cref="AcceptOnMatch"/>. If there is an exact match between the value - /// of the <see cref="LevelToMatch"/> option and the <see cref="Level"/> of the - /// <see cref="LoggingEvent"/>, then the <see cref="Decide"/> method returns <see cref="FilterDecision.Accept"/> in + /// of the <see cref="LevelToMatch"/> option and the <see cref="Level"/> of the + /// <see cref="LoggingEvent"/>, then the <see cref="Decide"/> method returns <see cref="FilterDecision.Accept"/> in /// case the <see cref="AcceptOnMatch"/> option value is set - /// to <c>true</c>, if it is <c>false</c> then + /// to <c>true</c>, if it is <c>false</c> then /// <see cref="FilterDecision.Deny"/> is returned. If the <see cref="Level"/> does not match then /// the result will be <see cref="FilterDecision.Neutral"/>. /// </para> @@ -76,7 +76,7 @@ namespace log4net.Filter /// <para> /// The <see cref="AcceptOnMatch"/> property is a flag that determines /// the behavior when a matching <see cref="Level"/> is found. If the - /// flag is set to true then the filter will <see cref="FilterDecision.Accept"/> the + /// flag is set to true then the filter will <see cref="FilterDecision.Accept"/> the /// logging event, otherwise it will <see cref="FilterDecision.Deny"/> the event. /// </para> /// <para> @@ -94,7 +94,7 @@ namespace log4net.Filter /// </summary> /// <remarks> /// <para> - /// The level that this filter will attempt to match against the + /// The level that this filter will attempt to match against the /// <see cref="LoggingEvent"/> level. If a match is found then /// the result depends on the value of <see cref="AcceptOnMatch"/>. /// </para> @@ -122,14 +122,14 @@ namespace log4net.Filter /// the result will be <see cref="FilterDecision.Neutral"/>. /// </para> /// </remarks> - override public FilterDecision Decide(LoggingEvent loggingEvent) + override public FilterDecision Decide(LoggingEvent loggingEvent) { if (loggingEvent == null) { throw new ArgumentNullException("loggingEvent"); } - if (m_levelToMatch != null && m_levelToMatch == loggingEvent.Level) + if (m_levelToMatch != null && m_levelToMatch == loggingEvent.Level) { // Found match return m_acceptOnMatch ? FilterDecision.Accept : FilterDecision.Deny; http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Filter/LevelRangeFilter.cs ---------------------------------------------------------------------- diff --git a/src/Filter/LevelRangeFilter.cs b/src/Filter/LevelRangeFilter.cs index 9afc03a..6e6f86d 100644 --- a/src/Filter/LevelRangeFilter.cs +++ b/src/Filter/LevelRangeFilter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -33,8 +33,8 @@ namespace log4net.Filter /// The filter admits three options <see cref="LevelMin"/> and <see cref="LevelMax"/> /// that determine the range of priorities that are matched, and /// <see cref="AcceptOnMatch"/>. If there is a match between the range - /// of priorities and the <see cref="Level"/> of the <see cref="LoggingEvent"/>, then the - /// <see cref="Decide"/> method returns <see cref="FilterDecision.Accept"/> in case the <see cref="AcceptOnMatch"/> + /// of priorities and the <see cref="Level"/> of the <see cref="LoggingEvent"/>, then the + /// <see cref="Decide"/> method returns <see cref="FilterDecision.Accept"/> in case the <see cref="AcceptOnMatch"/> /// option value is set to <c>true</c>, if it is <c>false</c> /// then <see cref="FilterDecision.Deny"/> is returned. If there is no match, <see cref="FilterDecision.Deny"/> is returned. /// </para> @@ -80,7 +80,7 @@ namespace log4net.Filter /// <para> /// The <see cref="AcceptOnMatch"/> property is a flag that determines /// the behavior when a matching <see cref="Level"/> is found. If the - /// flag is set to true then the filter will <see cref="FilterDecision.Accept"/> the + /// flag is set to true then the filter will <see cref="FilterDecision.Accept"/> the /// logging event, otherwise it will <see cref="FilterDecision.Neutral"/> the event. /// </para> /// <para> @@ -98,7 +98,7 @@ namespace log4net.Filter /// </summary> /// <remarks> /// <para> - /// The minimum level that this filter will attempt to match against the + /// The minimum level that this filter will attempt to match against the /// <see cref="LoggingEvent"/> level. If a match is found then /// the result depends on the value of <see cref="AcceptOnMatch"/>. /// </para> @@ -114,7 +114,7 @@ namespace log4net.Filter /// </summary> /// <remarks> /// <para> - /// The maximum level that this filter will attempt to match against the + /// The maximum level that this filter will attempt to match against the /// <see cref="LoggingEvent"/> level. If a match is found then /// the result depends on the value of <see cref="AcceptOnMatch"/>. /// </para> @@ -142,38 +142,38 @@ namespace log4net.Filter /// <see cref="FilterDecision.Neutral"/> is returned. /// </para> /// </remarks> - override public FilterDecision Decide(LoggingEvent loggingEvent) + override public FilterDecision Decide(LoggingEvent loggingEvent) { if (loggingEvent == null) { throw new ArgumentNullException("loggingEvent"); } - if (m_levelMin != null) + if (m_levelMin != null) { - if (loggingEvent.Level < m_levelMin) + if (loggingEvent.Level < m_levelMin) { // level of event is less than minimum return FilterDecision.Deny; } } - if (m_levelMax != null) + if (m_levelMax != null) { - if (loggingEvent.Level > m_levelMax) + if (loggingEvent.Level > m_levelMax) { // level of event is greater than maximum return FilterDecision.Deny; } } - if (m_acceptOnMatch) + if (m_acceptOnMatch) { // this filter set up to bypass later filters and always return // accept if level in range return FilterDecision.Accept; } - else + else { // event is ok for this filter; allow later filters to have a look.. return FilterDecision.Neutral; http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Filter/LoggerMatchFilter.cs ---------------------------------------------------------------------- diff --git a/src/Filter/LoggerMatchFilter.cs b/src/Filter/LoggerMatchFilter.cs index 828a304..15ca9da 100644 --- a/src/Filter/LoggerMatchFilter.cs +++ b/src/Filter/LoggerMatchFilter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -30,12 +30,12 @@ namespace log4net.Filter /// </summary> /// <remarks> /// <para> - /// The works very similar to the <see cref="LevelMatchFilter"/>. It admits two - /// options <see cref="LoggerToMatch"/> and <see cref="AcceptOnMatch"/>. If the - /// <see cref="LoggingEvent.LoggerName"/> of the <see cref="LoggingEvent"/> starts - /// with the value of the <see cref="LoggerToMatch"/> option, then the - /// <see cref="Decide"/> method returns <see cref="FilterDecision.Accept"/> in - /// case the <see cref="AcceptOnMatch"/> option value is set to <c>true</c>, + /// The works very similar to the <see cref="LevelMatchFilter"/>. It admits two + /// options <see cref="LoggerToMatch"/> and <see cref="AcceptOnMatch"/>. If the + /// <see cref="LoggingEvent.LoggerName"/> of the <see cref="LoggingEvent"/> starts + /// with the value of the <see cref="LoggerToMatch"/> option, then the + /// <see cref="Decide"/> method returns <see cref="FilterDecision.Accept"/> in + /// case the <see cref="AcceptOnMatch"/> option value is set to <c>true</c>, /// if it is <c>false</c> then <see cref="FilterDecision.Deny"/> is returned. /// </para> /// </remarks> @@ -76,7 +76,7 @@ namespace log4net.Filter /// <para> /// The <see cref="AcceptOnMatch"/> property is a flag that determines /// the behavior when a matching <see cref="Level"/> is found. If the - /// flag is set to true then the filter will <see cref="FilterDecision.Accept"/> the + /// flag is set to true then the filter will <see cref="FilterDecision.Accept"/> the /// logging event, otherwise it will <see cref="FilterDecision.Deny"/> the event. /// </para> /// <para> @@ -107,7 +107,7 @@ namespace log4net.Filter set { m_loggerToMatch = value; } } - #endregion + #endregion #region Override implementation of FilterSkeleton @@ -119,7 +119,7 @@ namespace log4net.Filter /// <remarks> /// <para> /// The rendered message is matched against the <see cref="LoggerToMatch"/>. - /// If the <see cref="LoggerToMatch"/> equals the beginning of + /// If the <see cref="LoggerToMatch"/> equals the beginning of /// the incoming <see cref="LoggingEvent.LoggerName"/> (<see cref="M:String.StartsWith(string)"/>) /// then a match will have occurred. If no match occurs /// this function will return <see cref="FilterDecision.Neutral"/> @@ -129,7 +129,7 @@ namespace log4net.Filter /// <see cref="FilterDecision.Deny"/> is returned. /// </para> /// </remarks> - override public FilterDecision Decide(LoggingEvent loggingEvent) + override public FilterDecision Decide(LoggingEvent loggingEvent) { if (loggingEvent == null) { @@ -137,14 +137,14 @@ namespace log4net.Filter } // Check if we have been setup to filter - if ((m_loggerToMatch != null && m_loggerToMatch.Length != 0) && + if ((m_loggerToMatch != null && m_loggerToMatch.Length != 0) && loggingEvent.LoggerName.StartsWith(m_loggerToMatch)) { // we've got a match - if (m_acceptOnMatch) + if (m_acceptOnMatch) { return FilterDecision.Accept; - } + } return FilterDecision.Deny; } else http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Filter/MdcFilter.cs ---------------------------------------------------------------------- diff --git a/src/Filter/MdcFilter.cs b/src/Filter/MdcFilter.cs index 3ca7953..410b2f4 100644 --- a/src/Filter/MdcFilter.cs +++ b/src/Filter/MdcFilter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Filter/NdcFilter.cs ---------------------------------------------------------------------- diff --git a/src/Filter/NdcFilter.cs b/src/Filter/NdcFilter.cs index e1659fe..6fba8ac 100644 --- a/src/Filter/NdcFilter.cs +++ b/src/Filter/NdcFilter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -35,7 +35,7 @@ namespace log4net.Filter /// </para> /// <para> /// As the MDC has been replaced with named stacks stored in the - /// properties collections the <see cref="PropertyFilter"/> should + /// properties collections the <see cref="PropertyFilter"/> should /// be used instead. /// </para> /// </remarks> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Filter/PropertyFilter.cs ---------------------------------------------------------------------- diff --git a/src/Filter/PropertyFilter.cs b/src/Filter/PropertyFilter.cs index 8c35c7f..d04a26c 100644 --- a/src/Filter/PropertyFilter.cs +++ b/src/Filter/PropertyFilter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -64,7 +64,7 @@ namespace log4net.Filter /// <remarks> /// <para> /// The key name to use to lookup in the properties map of the - /// <see cref="LoggingEvent"/>. The match will be performed against + /// <see cref="LoggingEvent"/>. The match will be performed against /// the value of this property if it exists. /// </para> /// </remarks> @@ -83,7 +83,7 @@ namespace log4net.Filter /// <returns>see remarks</returns> /// <remarks> /// <para> - /// The event property for the <see cref="Key"/> is matched against + /// The event property for the <see cref="Key"/> is matched against /// the <see cref="StringMatchFilter.StringToMatch"/>. /// If the <see cref="StringMatchFilter.StringToMatch"/> occurs as a substring within /// the property value then a match will have occurred. If no match occurs @@ -94,7 +94,7 @@ namespace log4net.Filter /// <see cref="FilterDecision.Deny"/> is returned. /// </para> /// </remarks> - override public FilterDecision Decide(LoggingEvent loggingEvent) + override public FilterDecision Decide(LoggingEvent loggingEvent) { if (loggingEvent == null) { @@ -109,7 +109,7 @@ namespace log4net.Filter return FilterDecision.Neutral; } - // Lookup the string to match in from the properties using + // Lookup the string to match in from the properties using // the key specified. object msgObj = loggingEvent.LookupProperty(m_key); @@ -123,7 +123,7 @@ namespace log4net.Filter // to continue processing return FilterDecision.Neutral; } - + // Firstly check if we are matching using a regex if (m_regexToMatch != null) { @@ -132,29 +132,29 @@ namespace log4net.Filter { // No match, continue processing return FilterDecision.Neutral; - } + } // we've got a match - if (m_acceptOnMatch) + if (m_acceptOnMatch) { return FilterDecision.Accept; - } + } return FilterDecision.Deny; } else if (m_stringToMatch != null) { // Check substring match - if (msg.IndexOf(m_stringToMatch) == -1) + if (msg.IndexOf(m_stringToMatch) == -1) { // No match, continue processing return FilterDecision.Neutral; - } + } // we've got a match - if (m_acceptOnMatch) + if (m_acceptOnMatch) { return FilterDecision.Accept; - } + } return FilterDecision.Deny; } return FilterDecision.Neutral; http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Filter/StringMatchFilter.cs ---------------------------------------------------------------------- diff --git a/src/Filter/StringMatchFilter.cs b/src/Filter/StringMatchFilter.cs index 38fa49d..d4b85c8 100644 --- a/src/Filter/StringMatchFilter.cs +++ b/src/Filter/StringMatchFilter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -81,17 +81,17 @@ namespace log4net.Filter /// <remarks> /// <para> /// This is part of the <see cref="IOptionHandler"/> delayed object - /// activation scheme. The <see cref="ActivateOptions"/> method must + /// activation scheme. The <see cref="ActivateOptions"/> method must /// be called on this object after the configuration properties have /// been set. Until <see cref="ActivateOptions"/> is called this - /// object is in an undefined state and must not be used. + /// object is in an undefined state and must not be used. /// </para> /// <para> - /// If any of the configuration properties are modified then + /// If any of the configuration properties are modified then /// <see cref="ActivateOptions"/> must be called again. /// </para> /// </remarks> - override public void ActivateOptions() + override public void ActivateOptions() { if (m_stringRegexToMatch != null) { @@ -112,7 +112,7 @@ namespace log4net.Filter /// <para> /// The <see cref="AcceptOnMatch"/> property is a flag that determines /// the behavior when a matching <see cref="Level"/> is found. If the - /// flag is set to true then the filter will <see cref="FilterDecision.Accept"/> the + /// flag is set to true then the filter will <see cref="FilterDecision.Accept"/> the /// logging event, otherwise it will <see cref="FilterDecision.Neutral"/> the event. /// </para> /// <para> @@ -186,7 +186,7 @@ namespace log4net.Filter /// <see cref="FilterDecision.Deny"/> is returned. /// </para> /// </remarks> - override public FilterDecision Decide(LoggingEvent loggingEvent) + override public FilterDecision Decide(LoggingEvent loggingEvent) { if (loggingEvent == null) { @@ -202,7 +202,7 @@ namespace log4net.Filter // to continue processing return FilterDecision.Neutral; } - + // Firstly check if we are matching using a regex if (m_regexToMatch != null) { @@ -211,29 +211,29 @@ namespace log4net.Filter { // No match, continue processing return FilterDecision.Neutral; - } + } // we've got a match - if (m_acceptOnMatch) + if (m_acceptOnMatch) { return FilterDecision.Accept; - } + } return FilterDecision.Deny; } else if (m_stringToMatch != null) { // Check substring match - if (msg.IndexOf(m_stringToMatch) == -1) + if (msg.IndexOf(m_stringToMatch) == -1) { // No match, continue processing return FilterDecision.Neutral; - } + } // we've got a match - if (m_acceptOnMatch) + if (m_acceptOnMatch) { return FilterDecision.Accept; - } + } return FilterDecision.Deny; } return FilterDecision.Neutral; http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/GlobalContext.cs ---------------------------------------------------------------------- diff --git a/src/GlobalContext.cs b/src/GlobalContext.cs index dd02a90..385edbe 100644 --- a/src/GlobalContext.cs +++ b/src/GlobalContext.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -29,16 +29,16 @@ namespace log4net /// </summary> /// <remarks> /// <para> - /// The <c>GlobalContext</c> provides a location for global debugging + /// The <c>GlobalContext</c> provides a location for global debugging /// information to be stored. /// </para> /// <para> - /// The global context has a properties map and these properties can + /// The global context has a properties map and these properties can /// be included in the output of log messages. The <see cref="log4net.Layout.PatternLayout"/> /// supports selecting and outputing these properties. /// </para> /// <para> - /// By default the <c>log4net:HostName</c> property is set to the name of + /// By default the <c>log4net:HostName</c> property is set to the name of /// the current machine. /// </para> /// </remarks> @@ -54,7 +54,7 @@ namespace log4net #region Private Instance Constructors /// <summary> - /// Private Constructor. + /// Private Constructor. /// </summary> /// <remarks> /// Uses a private access modifier to prevent instantiation of this class.
