Repository: logging-log4j2 Updated Branches: refs/heads/master 8e222830e -> ae33698a1
[LOG4J2-2023] Use a class' canonical name instead of name to create its logger name. If the canonical name is null, then use the class name. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ae33698a Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ae33698a Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ae33698a Branch: refs/heads/master Commit: ae33698a1846a5e10684ec3e52a99223f06047af Parents: 8e22283 Author: Gary Gregory <[email protected]> Authored: Thu Aug 31 11:41:57 2017 -0600 Committer: Gary Gregory <[email protected]> Committed: Thu Aug 31 11:41:57 2017 -0600 ---------------------------------------------------------------------- .../src/main/java/org/apache/logging/log4j/LogManager.java | 9 +++++++-- src/changes/changes.xml | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ae33698a/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java b/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java index a59b1be..3f366bb 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java @@ -380,6 +380,11 @@ public class LogManager { } } + private static String toLoggerName(final Class<?> cls) { + String canonicalName = cls.getCanonicalName(); + return canonicalName != null ? canonicalName : cls.getName(); + } + /** * Returns the current LoggerContextFactory. * @@ -548,7 +553,7 @@ public class LogManager { */ public static Logger getLogger(final Class<?> clazz) { final Class<?> cls = callerClass(clazz); - return getContext(cls.getClassLoader(), false).getLogger(cls.getCanonicalName()); + return getContext(cls.getClassLoader(), false).getLogger(toLoggerName(cls)); } /** @@ -564,7 +569,7 @@ public class LogManager { */ public static Logger getLogger(final Class<?> clazz, final MessageFactory messageFactory) { final Class<?> cls = callerClass(clazz); - return getContext(cls.getClassLoader(), false).getLogger(cls.getCanonicalName(), messageFactory); + return getContext(cls.getClassLoader(), false).getLogger(toLoggerName(cls), messageFactory); } /** http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ae33698a/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 7f97ff0..e372018 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -31,6 +31,9 @@ - "remove" - Removed --> <release version="2.9.1" date="2017-MM-DD" description="GA Release 2.9.1"> + <action issue="LOG4J2-2023" dev="ggregory" type="update"> + Use a class' canonical name instead of name to create its logger name. + </action> <action issue="LOG4J2-2026" dev="ggregory" type="fix" due-to="Leon Finker"> java.lang.AbstractMethodError: javax.xml.parsers.DocumentBuilderFactory.setFeature(). </action>
