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 16:37:20 UTC
[1/2] logging-log4j2 git commit: LOG4J2-1296 fix
RingBufferLogEvent.StringBuilderWrapperMessage to correctly implement
#getFormattedMessage
Repository: logging-log4j2
Updated Branches:
refs/heads/LOG4J2-1278-gc-free-logger 57e8ac9af -> df1ed3eec
LOG4J2-1296 fix RingBufferLogEvent.StringBuilderWrapperMessage to correctly implement #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/9ada17cf
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9ada17cf
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9ada17cf
Branch: refs/heads/LOG4J2-1278-gc-free-logger
Commit: 9ada17cf10085baa4862ab7d8f64b07fab8283f1
Parents: b53e048
Author: rpopma <rp...@apache.org>
Authored: Wed Mar 23 00:36:14 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Mar 23 00:36:14 2016 +0900
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/async/RingBufferLogEvent.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9ada17cf/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 156261c..d7a24c2 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
@@ -71,11 +71,12 @@ public class RingBufferLogEvent implements LogEvent {
private static class StringBuilderWrapperMessage implements ReusableMessage {
static final StringBuilderWrapperMessage INSTANCE = new StringBuilderWrapperMessage();
+ private static final Object[] PARAMS = new Object[0];
private StringBuilder stringBuilder;
@Override
public String getFormattedMessage() {
- return null;
+ return stringBuilder.toString();
}
@Override
@@ -85,7 +86,7 @@ public class RingBufferLogEvent implements LogEvent {
@Override
public Object[] getParameters() {
- return new Object[0];
+ return PARAMS;
}
@Override
[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/df1ed3ee
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/df1ed3ee
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/df1ed3ee
Branch: refs/heads/LOG4J2-1278-gc-free-logger
Commit: df1ed3eec60ccc6e98e43440b262f4079eed7482
Parents: 57e8ac9 9ada17c
Author: rpopma <rp...@apache.org>
Authored: Wed Mar 23 00:36:50 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Mar 23 00:36:50 2016 +0900
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/async/RingBufferLogEvent.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------