Repository: logging-log4j2 Updated Branches: refs/heads/master 34809a276 -> ecc35f922
LOG4J2-1291 fix NPE in TextEncoderHelper when system property "log4j2.enable.direct.encoders" is not set Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ecc35f92 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ecc35f92 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ecc35f92 Branch: refs/heads/master Commit: ecc35f922b0ce47ea3d914021be108cb17817b47 Parents: 34809a2 Author: rpopma <[email protected]> Authored: Sat Apr 9 00:07:31 2016 +0900 Committer: rpopma <[email protected]> Committed: Sat Apr 9 00:07:31 2016 +0900 ---------------------------------------------------------------------- .../apache/logging/log4j/core/layout/AbstractStringLayout.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ecc35f92/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java index 19dbaf4..757e9da 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java @@ -59,7 +59,7 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> implem private static final ThreadLocal<StringBuilder> threadLocal = new ThreadLocal<>(); - private final TextEncoderHelper textEncoderHelper; + private TextEncoderHelper textEncoderHelper; /** * Returns a {@code StringBuilder} that this Layout implementation can use to write the formatted log event to. @@ -148,6 +148,9 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> implem * @return a {@code TextEncoderHelper} */ protected TextEncoderHelper getCachedTextEncoderHelper() { + if (textEncoderHelper == null) { + textEncoderHelper = new TextEncoderHelper(getCharset()); + } return textEncoderHelper; }
