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 17:43:31 UTC

svn commit: r1697197 - in /logging/log4net/branches/log4net-1.2.x/src: ./ Repository/Hierarchy/Logger.cs

Author: bodewig
Date: Sun Aug 23 15:43:30 2015
New Revision: 1697197

URL: http://svn.apache.org/r1697197
Log:
merge infinite loop avoiding patch by Éric Daigneault for pull request #14

Modified:
    logging/log4net/branches/log4net-1.2.x/src/   (props changed)
    logging/log4net/branches/log4net-1.2.x/src/Repository/Hierarchy/Logger.cs

Propchange: logging/log4net/branches/log4net-1.2.x/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 23 15:43:30 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,1665915,1669884-1669885
+/logging/log4net/trunk/src/log4net:1541408,1544744,1665915,1669884-1669885,1669887

Modified: logging/log4net/branches/log4net-1.2.x/src/Repository/Hierarchy/Logger.cs
URL: http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/src/Repository/Hierarchy/Logger.cs?rev=1697197&r1=1697196&r2=1697197&view=diff
==============================================================================
--- logging/log4net/branches/log4net-1.2.x/src/Repository/Hierarchy/Logger.cs (original)
+++ logging/log4net/branches/log4net-1.2.x/src/Repository/Hierarchy/Logger.cs Sun Aug 23 15:43:30 2015
@@ -599,6 +599,7 @@ namespace log4net.Repository.Hierarchy
 			//
 			if (!m_hierarchy.EmittedNoAppenderWarning && writes == 0) 
 			{
+				m_hierarchy.EmittedNoAppenderWarning = true;
 				LogLog.Debug(declaringType, "No appenders could be found for logger [" + Name + "] repository [" + Repository.Name + "]");
 				LogLog.Debug(declaringType, "Please initialize the log4net system properly.");
 				try
@@ -614,7 +615,6 @@ namespace log4net.Repository.Hierarchy
 				{
 					// Insufficient permissions to display info from the AppDomain
 				}
-				m_hierarchy.EmittedNoAppenderWarning = true;
 			}
 		}