svn commit: r1069907 - /mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/util/Log4jXmlFormatter.java

[el...@apache.org]

Author: elecharny
Date: Fri Feb 11 17:43:04 2011
New Revision: 1069907

URL: http://svn.apache.org/viewvc?rev=1069907&view=rev
Log:
o Fixing some potential NPE in toString() methods

Modified:
    mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/util/Log4jXmlFormatter.java

Modified: mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/util/Log4jXmlFormatter.java
URL: http://svn.apache.org/viewvc/mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/util/Log4jXmlFormatter.java?rev=1069907&r1=1069906&r2=1069907&view=diff
==============================================================================
--- mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/util/Log4jXmlFormatter.java (original)
+++ mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/util/Log4jXmlFormatter.java Fri Feb 11 17:43:04 2011
@@ -19,13 +19,13 @@
  */
 package org.apache.mina.util;
 
-import org.slf4j.MDC;
-
-import java.util.logging.Formatter;
-import java.util.logging.LogRecord;
+import java.util.Arrays;
 import java.util.Map;
 import java.util.Set;
-import java.util.Arrays;
+import java.util.logging.Formatter;
+import java.util.logging.LogRecord;
+
+import org.slf4j.MDC;
 
 /**
  * Implementation of {@link java.util.logging.Formatter} that generates xml in the log4j format.
@@ -41,7 +41,7 @@ import java.util.Arrays;
  * <p>
  * The implementation is heavily based on org.apache.log4j.xml.XMLLayout
  * </p>
- * 
+ *
  * @author <a href="http://mina.apache.org">Apache MINA Project</a>
  */
 public class Log4jXmlFormatter extends Formatter {
@@ -93,6 +93,7 @@ public class Log4jXmlFormatter extends F
         return properties;
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public String format(final LogRecord record) {
         // Reset working buffer. If the buffer is too large, then we need a new
@@ -143,12 +144,12 @@ public class Log4jXmlFormatter extends F
             Map contextMap = MDC.getCopyOfContextMap();
             if (contextMap != null) {
                 Set keySet = contextMap.keySet();
-                if (keySet != null && keySet.size() > 0) {
+                if (( keySet != null ) && ( keySet.size() > 0 )) {
                     buf.append("<log4j:properties>\r\n");
                     Object[] keys = keySet.toArray();
                     Arrays.sort(keys);
                     for (Object key1 : keys) {
-                        String key = key1.toString();
+                        String key = (key1 == null?"":key1.toString());
                         Object val = contextMap.get(key);
                         if (val != null) {
                             buf.append("<log4j:data name=\"");
@@ -161,7 +162,7 @@ public class Log4jXmlFormatter extends F
                     buf.append("</log4j:properties>\r\n");
                 }
             }
-            
+
         }
         buf.append("</log4j:event>\r\n\r\n");