You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/03/22 17:32:43 UTC
[1/2] logging-log4j2 git commit: LOG4J2-1296
RingBufferLogEvent.StringBuilderWrapperMessage should also trim its
StringBuilder in #getFormattedMessage
Repository: logging-log4j2
Updated Branches:
refs/heads/LOG4J2-1278-gc-free-logger c9d274db3 -> d3e3947e9
LOG4J2-1296 RingBufferLogEvent.StringBuilderWrapperMessage should also trim its StringBuilder in #getFormattedMessage
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a0a4e43e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a0a4e43e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a0a4e43e
Branch: refs/heads/LOG4J2-1278-gc-free-logger
Commit: a0a4e43e2224130c8b33130772c3b78cbc7deece
Parents: 11ab37b
Author: rpopma <rp...@apache.org>
Authored: Wed Mar 23 01:31:59 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Mar 23 01:31:59 2016 +0900
----------------------------------------------------------------------
.../logging/log4j/core/async/RingBufferLogEvent.java | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a0a4e43e/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
index 5ad280b..10347a3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
@@ -76,7 +76,9 @@ public class RingBufferLogEvent implements LogEvent {
@Override
public String getFormattedMessage() {
- return stringBuilder.toString();
+ final String result = stringBuilder.toString();
+ trim(stringBuilder, MAX_REUSABLE_MESSAGE_SIZE);
+ return result;
}
@Override
@@ -97,11 +99,14 @@ public class RingBufferLogEvent implements LogEvent {
@Override
public void formatTo(final StringBuilder buffer) {
buffer.append(stringBuilder);
+ trim(stringBuilder, MAX_REUSABLE_MESSAGE_SIZE);
+ }
- // ensure that excessively long char[] arrays are not kept in memory forever
- if (stringBuilder.length() > MAX_REUSABLE_MESSAGE_SIZE) {
- stringBuilder.setLength(MAX_REUSABLE_MESSAGE_SIZE);
- stringBuilder.trimToSize();
+ // ensure that excessively long char[] arrays are not kept in memory forever
+ private static void trim(final StringBuilder sb, final int maxReusableMessageSize) {
+ if (sb.length() > maxReusableMessageSize) {
+ sb.setLength(maxReusableMessageSize);
+ sb.trimToSize();
}
}
[2/2] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Posted by rp...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d3e3947e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d3e3947e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d3e3947e
Branch: refs/heads/LOG4J2-1278-gc-free-logger
Commit: d3e3947e931ce9f516ab99ec8b55de94afb485b0
Parents: c9d274d a0a4e43
Author: rpopma <rp...@apache.org>
Authored: Wed Mar 23 01:32:35 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Mar 23 01:32:35 2016 +0900
----------------------------------------------------------------------
.../logging/log4j/core/async/RingBufferLogEvent.java | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------