LOG4J2-1434 Ensure max size cannot be configured to too small size.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6eff4fc4 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6eff4fc4 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6eff4fc4 Branch: refs/heads/LOG4J-1181 Commit: 6eff4fc461b8dcdfcc5c30d7583179204089dce2 Parents: 189c0d0 Author: rpopma <rpo...@apache.org> Authored: Sun Jun 19 09:06:07 2016 +0900 Committer: rpopma <rpo...@apache.org> Committed: Sun Jun 19 09:06:07 2016 +0900 ---------------------------------------------------------------------- .../apache/logging/log4j/core/layout/AbstractStringLayout.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6eff4fc4/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 c2edd6f..2d11ade 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 @@ -58,7 +58,8 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> implem */ protected static final int DEFAULT_STRING_BUILDER_SIZE = 1024; - protected static final int MAX_STRING_BUILDER_SIZE = size("log4j.layoutStringBuilder.maxSize", 2 * 1024); + protected static final int MAX_STRING_BUILDER_SIZE = Math.max(DEFAULT_STRING_BUILDER_SIZE, + size("log4j.layoutStringBuilder.maxSize", 2 * 1024)); private static final ThreadLocal<StringBuilder> threadLocal = new ThreadLocal<>();
