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/04/22 07:58:37 UTC
[03/15] logging-log4j2 git commit: LOG4J2-1342 bugfix: don't set
ReusableParameterizedMessage array to null
LOG4J2-1342 bugfix: don't set ReusableParameterizedMessage array to 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/1eadde59
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1eadde59
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1eadde59
Branch: refs/heads/master
Commit: 1eadde5971f209283275c59138867d9b55568ea4
Parents: a5f6a8b
Author: rpopma <rp...@apache.org>
Authored: Fri Apr 22 12:50:28 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Fri Apr 22 12:50:28 2016 +0900
----------------------------------------------------------------------
.../apache/logging/log4j/core/async/RingBufferLogEvent.java | 6 ++++--
.../org/apache/logging/log4j/core/impl/MutableLogEvent.java | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1eadde59/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 72ae8ac..ab5e3d0 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
@@ -115,8 +115,10 @@ public class RingBufferLogEvent implements LogEvent, ReusableMessage, CharSequen
if (msg instanceof ReusableMessage) {
ReusableMessage reusable = (ReusableMessage) msg;
reusable.formatTo(getMessageTextForWriting());
- parameters = reusable.swapParameters(parameters);
- parameterCount = reusable.getParameterCount();
+ if (parameters != null) {
+ parameters = reusable.swapParameters(parameters);
+ parameterCount = reusable.getParameterCount();
+ }
} else {
// if the Message instance is reused, there is no point in freezing its message here
if (!Constants.FORMAT_MESSAGES_IN_BACKGROUND && msg != null) { // LOG4J2-898: user may choose
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1eadde59/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
index 0393b0c..e256723 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
@@ -188,8 +188,10 @@ public class MutableLogEvent implements LogEvent, ReusableMessage {
if (msg instanceof ReusableMessage) {
ReusableMessage reusable = (ReusableMessage) msg;
reusable.formatTo(getMessageTextForWriting());
- parameters = reusable.swapParameters(parameters);
- parameterCount = reusable.getParameterCount();
+ if (parameters != null) {
+ parameters = reusable.swapParameters(parameters);
+ parameterCount = reusable.getParameterCount();
+ }
} else {
// if the Message instance is reused, there is no point in freezing its message here
if (!Constants.FORMAT_MESSAGES_IN_BACKGROUND && msg != null) { // LOG4J2-898: user may choose