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/02/26 00:53:34 UTC

[2/8] logging-log4j2 git commit: fix potential NPE

fix potential NPE


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c9286d71
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c9286d71
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c9286d71

Branch: refs/heads/LOG4J2-1278-gc-free-logger
Commit: c9286d7118e4bd371fc5ee513fc869bd8fcf1f51
Parents: fbcf07a
Author: rpopma <rp...@apache.org>
Authored: Fri Feb 26 02:40:40 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Fri Feb 26 02:40:40 2016 +0900

----------------------------------------------------------------------
 .../org/apache/logging/log4j/message/ParameterizedMessage.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c9286d71/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 64d3bb9..ab6a5bc 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
@@ -206,7 +206,8 @@ public class ParameterizedMessage implements Message, StringBuilderFormattable {
         if (formattedMessage != null) {
             buffer.append(formattedMessage);
         } else {
-            ParameterFormatter.formatMessage(buffer, messagePattern, argArray, argArray.length);
+            ParameterFormatter.formatMessage(buffer, messagePattern, argArray,
+                    argArray == null ? 0 : argArray.length);
         }
     }