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/29 19:04:31 UTC
[1/3] logging-log4j2 git commit: LOG4J2-1271 bugfix: messagePattern
may be null
Repository: logging-log4j2
Updated Branches:
refs/heads/LOG4J2-1278-gc-free-logger b175020c7 -> eae04d269
LOG4J2-1271 bugfix: messagePattern may be null
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/87df9dfc
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/87df9dfc
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/87df9dfc
Branch: refs/heads/LOG4J2-1278-gc-free-logger
Commit: 87df9dfc16e966792df91a59794ea1f29a253eef
Parents: c5ea065
Author: rpopma <rp...@apache.org>
Authored: Wed Mar 30 02:00:06 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Mar 30 02:00:06 2016 +0900
----------------------------------------------------------------------
.../logging/log4j/message/ReusableParameterizedMessage.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/87df9dfc/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 b6a506f..66a0601 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
@@ -238,7 +238,8 @@ public class ReusableParameterizedMessage implements ReusableMessage {
private StringBuilder getBuffer() {
StringBuilder result = buffer.get();
if (result == null) {
- result = new StringBuilder(Math.min(512, messagePattern.length() * 2));
+ final int currentPatternLength = messagePattern == null ? 0 : messagePattern.length();
+ result = new StringBuilder(Math.min(512, currentPatternLength * 2));
buffer.set(result);
}
result.setLength(0);
[3/3] 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/eae04d26
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/eae04d26
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/eae04d26
Branch: refs/heads/LOG4J2-1278-gc-free-logger
Commit: eae04d269af2751889cb3005a4f94ace56781aab
Parents: b175020 591c584
Author: rpopma <rp...@apache.org>
Authored: Wed Mar 30 02:04:28 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Mar 30 02:04:28 2016 +0900
----------------------------------------------------------------------
.../org/apache/logging/log4j/message/ParameterizedMessage.java | 2 +-
.../logging/log4j/message/ReusableParameterizedMessage.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/eae04d26/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
----------------------------------------------------------------------
[2/3] logging-log4j2 git commit: LOG4J2-1271 bugfix: number of
indices is at most half the length of the messagePattern
Posted by rp...@apache.org.
LOG4J2-1271 bugfix: number of indices is at most half the length of the messagePattern
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/591c5847
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/591c5847
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/591c5847
Branch: refs/heads/LOG4J2-1278-gc-free-logger
Commit: 591c5847a1e11e3f193f15ab6da700a7ea91108b
Parents: 87df9df
Author: rpopma <rp...@apache.org>
Authored: Wed Mar 30 02:04:00 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Mar 30 02:04:00 2016 +0900
----------------------------------------------------------------------
.../org/apache/logging/log4j/message/ParameterizedMessage.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/591c5847/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
index 8ad42b6..0d851a2 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
@@ -135,7 +135,7 @@ public class ParameterizedMessage implements Message, StringBuilderFormattable {
private void init(String messagePattern) {
this.messagePattern = messagePattern;
- this.indices = new int[messagePattern == null ? 0 : messagePattern.length() << 1];
+ this.indices = new int[messagePattern == null ? 0 : messagePattern.length() >> 1]; // divide by 2
int usedCount = ParameterFormatter.countArgumentPlaceholders2(messagePattern, indices);
initThrowable(argArray, usedCount);
this.usedCount = Math.min(usedCount, (argArray == null) ? 0 : argArray.length);