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:38 UTC
[04/15] logging-log4j2 git commit: LOG4J2-1342 ensure internal array
is not set to null by incorrect swap() invocation
LOG4J2-1342 ensure internal array is not set to null by incorrect swap() invocation
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/aab635fd
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/aab635fd
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/aab635fd
Branch: refs/heads/master
Commit: aab635fd698c2078b9ad7d5917b4264640054047
Parents: 1eadde5
Author: rpopma <rp...@apache.org>
Authored: Fri Apr 22 12:51:13 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Fri Apr 22 12:51:13 2016 +0900
----------------------------------------------------------------------
.../logging/log4j/message/ReusableParameterizedMessage.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/aab635fd/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 4913c64..12f4346 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
@@ -17,6 +17,7 @@
package org.apache.logging.log4j.message;
import java.util.Arrays;
+import java.util.Objects;
import org.apache.logging.log4j.util.PerformanceSensitive;
@@ -61,10 +62,10 @@ public class ReusableParameterizedMessage implements ReusableMessage {
Object[] result;
if (varargs == null) {
result = params;
- params = emptyReplacement;
+ params = Objects.requireNonNull(emptyReplacement);
} else {
result = varargs;
- varargs = emptyReplacement;
+ varargs = Objects.requireNonNull(emptyReplacement);
}
return result;
}