incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r692350 - /incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/LogConfigManager.java
Date Fri, 05 Sep 2008 06:36:33 GMT
Author: fmeschbe
Date: Thu Sep  4 23:36:32 2008
New Revision: 692350

URL: http://svn.apache.org/viewvc?rev=692350&view=rev
Log:
SLING-647 Accept writer configuration for the same PID as already
configured instead of rejecting those. In fact configurations with
different PID for the same writer is to be rejected.

Modified:
    incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/LogConfigManager.java

Modified: incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/LogConfigManager.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/LogConfigManager.java?rev=692350&r1=692349&r2=692350&view=diff
==============================================================================
--- incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/LogConfigManager.java
(original)
+++ incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/LogConfigManager.java
Thu Sep  4 23:36:32 2008
@@ -245,7 +245,7 @@
                 // ensure unique configuration of the log writer
                 SlingLoggerWriter existingWriter = writerByFileName.get(logFileName);
                 if (existingWriter != null
-                    && existingWriter.getConfigurationPID().equals(pid)) {
+                    && !existingWriter.getConfigurationPID().equals(pid)) {
                     // this file is already configured by another LOG_PID
                     throw new ConfigurationException(LogManager.LOG_FILE,
                         "LogFile " + logFileName



Mime
View raw message