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:00:02 UTC
logging-log4j2 git commit: LOG4J2-1271 bugfix: messagePattern may be
null
Repository: logging-log4j2
Updated Branches:
refs/heads/master c5ea0659e -> 87df9dfc1
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/master
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);