You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ck...@apache.org on 2021/12/26 21:20:35 UTC

[logging-log4j2] 01/02: Fix MessageFactory support bug in SLF4JLoggerContext

This is an automated email from the ASF dual-hosted git repository.

ckozak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit 4755b1174a221e8844a69f1a77979ac15994e205
Author: Michael Vorburger <vo...@google.com>
AuthorDate: Thu Dec 23 17:20:43 2021 +0100

    Fix MessageFactory support bug in SLF4JLoggerContext
    
    as well as a related typo in LoggerTest
---
 .../java/org/apache/logging/slf4j/SLF4JLoggerContext.java    | 12 +++---------
 .../src/test/java/org/apache/logging/slf4j/LoggerTest.java   |  4 ++--
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java
index 4c0120b..1bcc71d 100644
--- a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java
+++ b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java
@@ -43,17 +43,11 @@ public class SLF4JLoggerContext implements LoggerContext {
 
     @Override
     public ExtendedLogger getLogger(final String name, final MessageFactory messageFactory) {
-        // FIXME according to LOG4J2-1180, the below line should be:
-        // FIXME if (!loggerRegistry.hasLogger(name, messageFactory)) {
-        if (!loggerRegistry.hasLogger(name)) {
-            // FIXME: should be loggerRegistry.putIfAbsent(name, messageFactory,
-            loggerRegistry.putIfAbsent(name, null,
+        if (!loggerRegistry.hasLogger(name, messageFactory)) {
+            loggerRegistry.putIfAbsent(name, messageFactory,
                     new SLF4JLogger(name, messageFactory, LoggerFactory.getLogger(name)));
         }
-        // FIXME should be return loggerRegistry.getLogger(name, messageFactory);
-        return loggerRegistry.getLogger(name);
-
-        // TODO applying the above fixes causes (log4j-to-slf4j) LoggerTest to fail
+        return loggerRegistry.getLogger(name, messageFactory);
     }
 
     @Override
diff --git a/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java b/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java
index 7485e8a..c54141a 100644
--- a/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java
+++ b/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java
@@ -112,7 +112,7 @@ public class LoggerTest {
 
     @Test
     public void getLogger_String_MessageFactoryMismatchNull() {
-        final Logger testLogger =  testMessageFactoryMismatch("getLogger_String_MessageFactoryMismatchNull",
+        final Logger testLogger = testMessageFactoryMismatch("getLogger_String_MessageFactoryMismatchNull",
             StringFormatterMessageFactory.INSTANCE, null);
         testLogger.debug("%,d", Integer.MAX_VALUE);
         assertThat(list.strList, hasSize(1));
@@ -124,7 +124,7 @@ public class LoggerTest {
         assertThat(testLogger, is(notNullValue()));
         checkMessageFactory(messageFactory1, testLogger);
         final Logger testLogger2 = LogManager.getLogger(name, messageFactory2);
-        checkMessageFactory(messageFactory1, testLogger2);
+        checkMessageFactory(messageFactory2, testLogger2);
         return testLogger;
     }