You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2017/03/01 19:30:16 UTC
logging-log4j2 git commit: [LOG4J2-1831] NullPointerException in
HtmlLayout.
Repository: logging-log4j2
Updated Branches:
refs/heads/master fd01f6974 -> c2d7bf0dc
[LOG4J2-1831] NullPointerException in HtmlLayout.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c2d7bf0d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c2d7bf0d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c2d7bf0d
Branch: refs/heads/master
Commit: c2d7bf0dcf41b5ab6effecc57b627a271f14d470
Parents: fd01f69
Author: ggregory <gg...@US-L-GG05.rocketsoftware.com>
Authored: Wed Mar 1 11:30:11 2017 -0800
Committer: ggregory <gg...@US-L-GG05.rocketsoftware.com>
Committed: Wed Mar 1 11:30:11 2017 -0800
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/layout/HtmlLayout.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/c2d7bf0d/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
index 87846ac..8a09e4a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
@@ -167,7 +167,7 @@ public final class HtmlLayout extends AbstractStringLayout {
sbuf.append("</td>").append(Strings.LINE_SEPARATOR);
String escapedLogger = Transform.escapeHtmlTags(event.getLoggerName());
- if (escapedLogger.isEmpty()) {
+ if (Strings.isEmpty(escapedLogger)) {
escapedLogger = LoggerConfig.ROOT;
}
sbuf.append("<td title=\"").append(escapedLogger).append(" logger\">");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c2d7bf0d/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 88d72a8..183a53c 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -34,6 +34,9 @@
<action issue="LOG4J2-1827" dev="rgoers" type="update">
Move integration tests to their own module to speed up build.
</action>
+ <action issue="LOG4J2-1831" dev="ggregory" type="fix">
+ NullPointerException in HtmlLayout.
+ </action>
</release>
<release version="2.8.1" date="2017-02-26" description="GA Release 2.8.1">
<action issue="LOG4J2-1804" dev="rgoers" type="fix" due-to="Pierrick Hymbert">