commit 97c89b9fa25042dec8d5d63ddcfb266c22d12d17
author Carter Kozak <ckozak@apache.org> Fri Jun 04 09:23:43 2021 -0400
committer Carter Kozak <ckozak@apache.org> Fri Jun 04 12:55:52 2021 -0400
tree 643c3be804b68b495e6a1a4f0f5cc2940000b0e8
parent 0295909aa97a9e8504e7a6b35e06b8af46e3817a

Fix incorrect LogManager accessor used by LOG4J2-2940

The `getContext()` accessor with no args has been used as a fallback
for Log4jLoggerFactory slf4j implementations for a while, but it's
much more likely to be used now that LOG4J2-2940 is resolved.
Without the `false` argument, the first slf4j LoggerFactory.getLogger
call will not cause log4j to initialize itself.

log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java

diff --git a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java b/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java
index ce71630..e5b0e58 100644
--- a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java
+++ b/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java
@@ -45,7 +45,7 @@
                 ? StackLocatorUtil.getCallerClass(FQCN, PACKAGE, 1)
                 : null;
         return anchor == null
-                ? LogManager.getContext()
+                ? LogManager.getContext(false)
                 : getContext(anchor);
     }
 

log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java

diff --git a/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java b/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java
index a1daa86..bb2a2d8 100644
--- a/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java
+++ b/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java
@@ -51,7 +51,7 @@
                 ? StackLocatorUtil.getCallerClass(FQCN, PACKAGE, 1)
                 : null;
         return anchor == null
-                ? LogManager.getContext()
+                ? LogManager.getContext(false)
                 : getContext(anchor);
     }