You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2014/09/05 14:12:38 UTC

git commit: The parameter obj should not be assigned.

Repository: logging-log4j2
Updated Branches:
  refs/heads/master dafee1ba8 -> 1fab25305


The parameter obj should not be assigned.


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

Branch: refs/heads/master
Commit: 1fab25305be908f786e7dafb771672c0e6bedadd
Parents: dafee1b
Author: Gary Gregory <ga...@gmail.com>
Authored: Fri Sep 5 08:12:31 2014 -0400
Committer: Gary Gregory <ga...@gmail.com>
Committed: Fri Sep 5 08:12:31 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/logging/log4j/message/ObjectMessage.java    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1fab2530/log4j-api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java
index 3441edb..53106be 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java
@@ -36,10 +36,7 @@ public class ObjectMessage implements Message {
      * @param obj The Object to format.
      */
     public ObjectMessage(Object obj) {
-        if (obj == null) {
-            obj = "null";
-        }
-        this.obj = obj;
+        this.obj = obj == null ? "null" : obj;
     }
 
     /**