[logging-log4j2] branch master updated: LOG4J2-3292: Fix ExtendedLoggerWrapper.logMessage double-logging

[ckozak]

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


The following commit(s) were added to refs/heads/master by this push:
     new 57a350a  LOG4J2-3292: Fix ExtendedLoggerWrapper.logMessage 
double-logging
57a350a is described below

commit 57a350a83f42d9544c2b9169ac1ff5ae1ed3c9a2
Author: Carter Kozak <cko...@apache.org>
AuthorDate: Sun Dec 26 23:09:10 2021 -0500

    LOG4J2-3292: Fix ExtendedLoggerWrapper.logMessage double-logging
    
    Previously when the logger instance was location-aware and
    the logger was configured to require location info, both branches
    were invoked rather than only the location-aware branch.
---
 .../main/java/org/apache/logging/log4j/spi/ExtendedLoggerWrapper.java  | 3 ++-
 src/changes/changes.xml                                                | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLoggerWrapper.java
 
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLoggerWrapper.java
index dfc369d..6c9c6c9 100644
--- 
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLoggerWrapper.java
+++ 
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLoggerWrapper.java
@@ -217,7 +217,8 @@ public class ExtendedLoggerWrapper extends AbstractLogger {
             final Throwable t) {
         if (requiresLocation()) {
             logger.logMessage(level, marker, fqcn, 
StackLocatorUtil.calcLocation(fqcn), message, t);
+        } else {
+            logger.logMessage(fqcn, level, marker, message, t);
         }
-        logger.logMessage(fqcn, level, marker, message, t);
     }
 }
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index e959615..4f16436 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -172,6 +172,9 @@
       </action>
     </release>
     <release version="2.17.1" date="2021-MM-DD" description="GA Release 
2.17.1">
+      <action issue="LOG4J2-3292" dev="ckozak" type="fix">
+        ExtendedLoggerWrapper.logMessage no longer double-logs when location 
is requested.
+      </action>
       <action issue="LOG4J2-3289" dev="ckozak" type="fix">
         log4j-to-slf4j no longer re-interpolates formatted message contents.
       </action>