Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B17CFDEE9 for ; Sun, 22 Jul 2012 19:34:04 +0000 (UTC) Received: (qmail 63911 invoked by uid 500); 22 Jul 2012 19:34:04 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 63887 invoked by uid 500); 22 Jul 2012 19:34:04 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 63873 invoked by uid 99); 22 Jul 2012 19:34:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Jul 2012 19:34:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Jul 2012 19:34:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3505C238897A; Sun, 22 Jul 2012 19:33:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1364404 - in /logging/log4j/log4j2/trunk/api/src: main/java/org/apache/logging/log4j/message/ObjectMessage.java test/java/org/apache/logging/log4j/message/ObjectMessageTest.java Date: Sun, 22 Jul 2012 19:33:44 -0000 To: commits@logging.apache.org From: rgoers@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120722193344.3505C238897A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rgoers Date: Sun Jul 22 19:33:43 2012 New Revision: 1364404 URL: http://svn.apache.org/viewvc?rev=1364404&view=rev Log: Eliminate NullPointerException if a null value is passed to the ObjectMessage constructor. Added: logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/message/ObjectMessageTest.java - copied, changed from r1361607, logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/message/ParameterizedMessageTest.java Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java?rev=1364404&r1=1364403&r2=1364404&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java (original) +++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java Sun Jul 22 19:33:43 2012 @@ -35,6 +35,9 @@ public class ObjectMessage implements Me * @param obj The Object to format. */ public ObjectMessage(Object obj) { + if (obj == null) { + obj = "null"; + } this.obj = obj; } Copied: logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/message/ObjectMessageTest.java (from r1361607, logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/message/ParameterizedMessageTest.java) URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/message/ObjectMessageTest.java?p2=logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/message/ObjectMessageTest.java&p1=logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/message/ParameterizedMessageTest.java&r1=1361607&r2=1364404&rev=1364404&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/message/ParameterizedMessageTest.java (original) +++ logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/message/ObjectMessageTest.java Sun Jul 22 19:33:43 2012 @@ -19,24 +19,24 @@ package org.apache.logging.log4j.message import org.junit.Test; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; /** * */ -public class ParameterizedMessageTest { +public class ObjectMessageTest { @Test - public void testNoArgs() { + public void testNull() { + ObjectMessage msg = new ObjectMessage(null); + String result = msg.getFormattedMessage(); + assertEquals("null", result); + } + + @Test + public void testNotNull() { String testMsg = "Test message {}"; - ParameterizedMessage msg = new ParameterizedMessage(testMsg, null); + ObjectMessage msg = new ObjectMessage(testMsg); String result = msg.getFormattedMessage(); assertEquals(testMsg, result); - Object[] array = null; - msg = new ParameterizedMessage(testMsg, array, null); - result = msg.getFormattedMessage(); - assertEquals(testMsg, result); } }