[jboss-svn-commits] JBoss Common SVN: r3140 - in slf4j-jboss-logging/trunk: src/main/java/org/jboss/slf4j and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2009-05-11 12:27:31 -0400 (Mon, 11 May 2009)
New Revision: 3140

Modified:
   slf4j-jboss-logging/trunk/pom.xml
   slf4j-jboss-logging/trunk/src/main/java/org/jboss/slf4j/JBossLoggerAdapter.java
   slf4j-jboss-logging/trunk/src/main/java/org/jboss/slf4j/JBossMDCAdapter.java
Log:
JBLOGGING-17 - update slf4j to 1.5.2

Modified: slf4j-jboss-logging/trunk/pom.xml
===================================================================
--- slf4j-jboss-logging/trunk/pom.xml	2009-05-11 16:25:53 UTC (rev 3139)
+++ slf4j-jboss-logging/trunk/pom.xml	2009-05-11 16:27:31 UTC (rev 3140)
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.5.0</version>
+      <version>1.5.3</version>
     </dependency>
 
     <dependency>

Modified: slf4j-jboss-logging/trunk/src/main/java/org/jboss/slf4j/JBossLoggerAdapter.java
===================================================================
--- slf4j-jboss-logging/trunk/src/main/java/org/jboss/slf4j/JBossLoggerAdapter.java	2009-05-11 16:25:53 UTC (rev 3139)
+++ slf4j-jboss-logging/trunk/src/main/java/org/jboss/slf4j/JBossLoggerAdapter.java	2009-05-11 16:27:31 UTC (rev 3140)
@@ -39,6 +39,8 @@
 public final class JBossLoggerAdapter extends MarkerIgnoringBase
    implements LocationAwareLogger
 {
+   private static final long serialVersionUID = -1855332334983449117L;
+
    final org.jboss.logging.Logger logger;
   
    // package access so that only JBossLoggerFactory be able to create one.

Modified: slf4j-jboss-logging/trunk/src/main/java/org/jboss/slf4j/JBossMDCAdapter.java
===================================================================
--- slf4j-jboss-logging/trunk/src/main/java/org/jboss/slf4j/JBossMDCAdapter.java	2009-05-11 16:25:53 UTC (rev 3139)
+++ slf4j-jboss-logging/trunk/src/main/java/org/jboss/slf4j/JBossMDCAdapter.java	2009-05-11 16:27:31 UTC (rev 3140)
@@ -58,4 +58,20 @@
       MDC.remove(key);
    }
 
+   public Map getCopyOfContextMap()
+   {
+      return MDC.getMap();
+   }
+
+   public void setContextMap(final Map contextMap)
+   {
+      clear();
+      for (Map.Entry entry : ((Map<?,?>)contextMap).entrySet()) {
+         final Object key = entry.getKey();
+         final Object value = entry.getValue();
+         if (key != null) {
+            put(String.valueOf(key), value == null ? null : String.valueOf(value));
+         }
+      }
+   }
 }