You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2017/03/10 13:42:55 UTC
[2/2] logging-log4j2 git commit: LOG4J2-1845 Handle when
LogEvent.getLoggerName() returns null in KafkaAppender
LOG4J2-1845 Handle when LogEvent.getLoggerName() returns null in KafkaAppender
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f81feeee
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f81feeee
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f81feeee
Branch: refs/heads/master
Commit: f81feeeeaf53eec870810e4e05de9801cdd4f63c
Parents: e418c39
Author: Mikael St�ldal <mi...@magine.com>
Authored: Fri Mar 10 14:42:44 2017 +0100
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Fri Mar 10 14:42:44 2017 +0100
----------------------------------------------------------------------
.../log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java | 2 +-
src/changes/changes.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f81feeee/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java
index d04ffc3..a1ef2ef 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java
@@ -77,7 +77,7 @@ public class LoggerNameLevelRewritePolicy implements RewritePolicy {
@Override
public LogEvent rewrite(final LogEvent event) {
- if (!event.getLoggerName().startsWith(loggerName)) {
+ if (event.getLoggerName() == null || !event.getLoggerName().startsWith(loggerName)) {
return event;
}
final Level sourceLevel = event.getLevel();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f81feeee/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 9dabf75..2a911c5 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -31,6 +31,9 @@
- "remove" - Removed
-->
<release version="2.8.2" date="2017-MM-DD" description="GA Release 2.8.2">
+ <action issue="LOG4J2-1846" dev="mikes" type="fix">
+ Handle when LogEvent.getLoggerName() returns null in LoggerNameLevelRewritePolicy.
+ </action>
<action issue="LOG4J2-1845" dev="mikes" type="fix">
Handle when LogEvent.getLoggerName() returns null in KafkaAppender.
</action>