[webbeans-commits] Webbeans SVN: r2442 - in ri/trunk/logging/src: test/java/org/jboss/webbeans/test/log and 1 other directory.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-04-16 14:24:09 -0400 (Thu, 16 Apr 2009)
New Revision: 2442

Modified:
   ri/trunk/logging/src/main/java/org/jboss/webbeans/log/LogImpl.java
   ri/trunk/logging/src/test/java/org/jboss/webbeans/test/log/LoggingTest.java
Log:
WBX-22

Modified: ri/trunk/logging/src/main/java/org/jboss/webbeans/log/LogImpl.java
===================================================================
--- ri/trunk/logging/src/main/java/org/jboss/webbeans/log/LogImpl.java	2009-04-16 17:35:33 UTC (rev 2441)
+++ ri/trunk/logging/src/main/java/org/jboss/webbeans/log/LogImpl.java	2009-04-16 18:24:09 UTC (rev 2442)
@@ -21,6 +21,7 @@
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 import java.text.MessageFormat;
+import java.util.Arrays;
 
 /**
  * 
@@ -173,6 +174,13 @@
       Object interpolatedMessage = message;
       if (params.length > 0)
       {
+         for (int i = 0; i < params.length; i++)
+         {
+            if (params[i].getClass().isArray())
+            {
+               params[i] = Arrays.asList((Object[]) params[i]);
+            }
+         }
          interpolatedMessage = MessageFormat.format(message.toString(), params);
       }
       return interpolatedMessage;

Modified: ri/trunk/logging/src/test/java/org/jboss/webbeans/test/log/LoggingTest.java
===================================================================
--- ri/trunk/logging/src/test/java/org/jboss/webbeans/test/log/LoggingTest.java	2009-04-16 17:35:33 UTC (rev 2441)
+++ ri/trunk/logging/src/test/java/org/jboss/webbeans/test/log/LoggingTest.java	2009-04-16 18:24:09 UTC (rev 2442)
@@ -56,4 +56,19 @@
       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 testArrayConversion()
+   {
+      Log log = Logging.getLog(LoggingTest.class);
+      assert log != null : "No Log object returned";
+      
+      String[] arr = new String[2];
+      arr[0] = "foo";
+      arr[1] = "bar";
+      
+      log.info("Message with {0} array {1}", arr, "baz");
+      assert TestAppender.getLastEvent() != null : "There was no last event in Log4j";
+      assert TestAppender.getLastEvent().getRenderedMessage().equals("Message with [foo, bar] array baz");
+   }
 }