Changeset 1085 for trunk/src/java/org/jcoderz/commons/LogMessageInfoImpl.java

Timestamp:

07/17/08 06:02:42 (4 years ago)

Author:

amandel

Message:

Protect logger against failures in the message pattern that
would otherwise cause a ArgumentMalformedException? to be
thrown.

Files:

• trunk/src/java/org/jcoderz/commons/LogMessageInfoImpl.java (modified) (1 diff)

trunk/src/java/org/jcoderz/commons/LogMessageInfoImpl.java

@@ -150 +150 @@
    public final StringBuffer formatMessage (Map parameters, StringBuffer buffer)
    {
-      final MessageFormat formatter = new MessageFormat(getMessagePattern());
-
-      final List parameter = new ArrayList();
-
-      if (parameters != null && !getParameterList().isEmpty())
-      {
-         final Iterator i = getParameterList().iterator();
-         while (i.hasNext())
-         {
-            final String parameterName = (String) i.next();
-            final List parameterValues = (List) parameters.get(parameterName);
-            if (parameterValues == null || parameterValues.isEmpty())
-            {
-               parameter.add(null);
-            }
-            else
-            {
-               parameter.add(parameterValues.get(0));
-            }
-         }
-      }
-
-      return formatter.format(parameter.toArray(),
-            buffer != null ? buffer : new StringBuffer(), null);
+       final StringBuffer result
+           = buffer != null ? buffer : new StringBuffer();
+       try
+       {
+          final MessageFormat formatter = new MessageFormat(getMessagePattern());
+
+          final List parameter = new ArrayList();
+
+          if (parameters != null && !getParameterList().isEmpty())
+          {
+             final Iterator i = getParameterList().iterator();
+             while (i.hasNext())
+             {
+                final String parameterName = (String) i.next();
+                final List parameterValues = (List) parameters.get(parameterName);
+                if (parameterValues == null || parameterValues.isEmpty())
+                {
+                   parameter.add(null);
+                }
+                else
+                {
+                   parameter.add(parameterValues.get(0));
+                }
+             }
+          }
+          formatter.format(parameter.toArray(), result, null);
+       }
+       // could be caused by invalid message format!
+       catch (Exception ex)
+       {
+           result.append(getParameterList());
+           result.append(' ');
+           result.append(getMessagePattern());
+       }
+      return result;
    }