You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2017/04/21 06:18:48 UTC
[12/19] logging-log4j2 git commit: LOG4J2-1858 ensure ThreadLocal
StringBuffer won't hold excessively much memory after logging a long message,
also fix Math.min -> Math.max bug
LOG4J2-1858 ensure ThreadLocal StringBuffer won't hold excessively much memory after logging a long message, also fix Math.min -> Math.max bug
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0f70fe7e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0f70fe7e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0f70fe7e
Branch: refs/heads/java9NoMultiRelease
Commit: 0f70fe7e16aefee30a9ece78c33717c8abe97efc
Parents: 28553e1
Author: rpopma <rp...@apache.org>
Authored: Sun Apr 16 16:52:04 2017 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sun Apr 16 16:52:04 2017 +0900
----------------------------------------------------------------------
.../logging/log4j/message/ReusableParameterizedMessage.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0f70fe7e/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
index dd42385..daf2994 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
@@ -18,7 +18,9 @@ package org.apache.logging.log4j.message;
import java.util.Arrays;
+import org.apache.logging.log4j.util.Constants;
import org.apache.logging.log4j.util.PerformanceSensitive;
+import org.apache.logging.log4j.util.StringBuilders;
/**
* Reusable parameterized message. This message is mutable and is not safe to be accessed or modified by multiple
@@ -288,7 +290,9 @@ public class ReusableParameterizedMessage implements ReusableMessage {
public String getFormattedMessage() {
final StringBuilder sb = getBuffer();
formatTo(sb);
- return sb.toString();
+ final String result = sb.toString();
+ StringBuilders.trimToMaxSize(sb, Constants.MAX_REUSABLE_MESSAGE_SIZE);
+ return result;
}
private StringBuilder getBuffer() {
@@ -298,7 +302,7 @@ public class ReusableParameterizedMessage implements ReusableMessage {
StringBuilder result = buffer.get();
if (result == null) {
final int currentPatternLength = messagePattern == null ? 0 : messagePattern.length();
- result = new StringBuilder(Math.min(MIN_BUILDER_SIZE, currentPatternLength * 2));
+ result = new StringBuilder(Math.max(MIN_BUILDER_SIZE, currentPatternLength * 2));
buffer.set(result);
}
result.setLength(0);