don't barf on a null value, complete with test

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@2642 1c488680-804c-0410-94cd-c6b725194a0e
weld · May 2, 2009 · c32341b · c32341b
1 parent b25c839
commit c32341b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/logging/src/main/java/org/jboss/webbeans/log/LogImpl.java b/logging/src/main/java/org/jboss/webbeans/log/LogImpl.java
@@ -176,7 +176,7 @@ private Object interpolate(Object message, Object... params)
       {
          for (int i = 0; i < params.length; i++)
          {
-            if (params[i].getClass().isArray())
+            if (params[i] != null && params[i].getClass().isArray())
             {
                params[i] = Arrays.asList((Object[]) params[i]);
             }

diff --git a/logging/src/test/java/org/jboss/webbeans/test/log/LoggingTest.java b/logging/src/test/java/org/jboss/webbeans/test/log/LoggingTest.java
@@ -56,6 +56,18 @@ public void testLogMessageFormatting()
       assert TestAppender.getLastEvent() != null : "There was no last event in Log4j";
       assert TestAppender.getLastEvent().getRenderedMessage().equals("Message with 3 parameters starting with param1 and including param2");
    }
+
+   @Test
+   public void testLogMessageFormattingWithNullValue()
+   {
+      Log log = Logging.getLog(LoggingTest.class);
+      assert log != null : "No Log object returned";
+
+      String value = null;
+      log.info("Verify we do not barf on a {0} value", value);
+      assert TestAppender.getLastEvent() != null : "There was no last event in Log4j";
+      assert TestAppender.getLastEvent().getRenderedMessage().equals("Verify we do not barf on a null value");
+   }
 
    @Test
    public void testArrayConversion()