Repository: logging-log4j2 Updated Branches: refs/heads/master e7a059128 -> 5c76f99ee
[LOG4J2-1180] Logger cache does not account for message factory. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5c76f99e Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5c76f99e Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5c76f99e Branch: refs/heads/master Commit: 5c76f99ee60f48fd78d3a49ad4f58dd1f5d173eb Parents: e7a0591 Author: ggregory <[email protected]> Authored: Mon Nov 2 07:44:22 2015 -0800 Committer: ggregory <[email protected]> Committed: Mon Nov 2 07:44:22 2015 -0800 ---------------------------------------------------------------------- .../org/apache/logging/log4j/simple/SimpleLoggerContext.java | 7 ++----- .../java/org/apache/logging/log4j/core/LoggerContext.java | 5 +---- 2 files changed, 3 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c76f99e/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java b/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java index 4967ea6..10be16a 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java @@ -101,12 +101,9 @@ public class SimpleLoggerContext implements LoggerContext { @Override public ExtendedLogger getLogger(final String name, final MessageFactory messageFactory) { - // Note: This is the only method where we add entries to the 'loggers' ivar. + // Note: This is the only method where we add entries to the 'loggers' ivar. // The loggers map key is the logger name plus the messageFactory FQCN (if any). - String key = name; - if (messageFactory != null) { - key = LoggerContextKey.create(name, messageFactory); - } + String key = LoggerContextKey.create(name, messageFactory); final ExtendedLogger extendedLogger = loggers.get(key); if (extendedLogger != null) { AbstractLogger.checkMessageFactory(extendedLogger, messageFactory); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c76f99e/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java index 0a2ee3f..420c684 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java @@ -394,10 +394,7 @@ public class LoggerContext extends AbstractLifeCycle implements org.apache.loggi public Logger getLogger(final String name, final MessageFactory messageFactory) { // Note: This is the only method where we add entries to the 'loggers' ivar. // The loggers map key is the logger name plus the messageFactory FQCN (if any). - String key = name; - if (messageFactory != null) { - key = LoggerContextKey.create(name, messageFactory); - } + String key = LoggerContextKey.create(name, messageFactory); Logger logger = loggers.get(key); if (logger != null) { AbstractLogger.checkMessageFactory(logger, messageFactory);
