[jboss-svn-commits] JBoss Common SVN: r4046 - jboss-logging/trunk/src/main/java/org/jboss/logging.

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

Author: david.lloyd at jboss.com
Date: 2010-02-22 12:13:25 -0500 (Mon, 22 Feb 2010)
New Revision: 4046

Modified:
   jboss-logging/trunk/src/main/java/org/jboss/logging/AbstractMdcLoggerProvider.java
   jboss-logging/trunk/src/main/java/org/jboss/logging/JBossLogManagerProvider.java
   jboss-logging/trunk/src/main/java/org/jboss/logging/Log4jLoggerProvider.java
   jboss-logging/trunk/src/main/java/org/jboss/logging/LoggerProvider.java
   jboss-logging/trunk/src/main/java/org/jboss/logging/MDC.java
   jboss-logging/trunk/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java
Log:
Make MDC.put() return the old MDC value for easier integration with try/finally restore blocks

Modified: jboss-logging/trunk/src/main/java/org/jboss/logging/AbstractMdcLoggerProvider.java
===================================================================
--- jboss-logging/trunk/src/main/java/org/jboss/logging/AbstractMdcLoggerProvider.java	2010-02-19 01:14:50 UTC (rev 4045)
+++ jboss-logging/trunk/src/main/java/org/jboss/logging/AbstractMdcLoggerProvider.java	2010-02-22 17:13:25 UTC (rev 4046)
@@ -37,13 +37,13 @@
         return mdcMap.get();
     }
 
-    public void putMdc(String key, Object value) {
+    public Object putMdc(String key, Object value) {
         Map<String, Object> map = mdcMap.get();
         if (map == null) {
             map = new HashMap<String, Object>();
             mdcMap.set(map);
         }
-        map.put(key, value);
+        return map.put(key, value);
     }
 
     public void removeMdc(String key) {

Modified: jboss-logging/trunk/src/main/java/org/jboss/logging/JBossLogManagerProvider.java
===================================================================
--- jboss-logging/trunk/src/main/java/org/jboss/logging/JBossLogManagerProvider.java	2010-02-19 01:14:50 UTC (rev 4045)
+++ jboss-logging/trunk/src/main/java/org/jboss/logging/JBossLogManagerProvider.java	2010-02-22 17:13:25 UTC (rev 4046)
@@ -62,8 +62,8 @@
         }
     }
 
-    public void putMdc(final String key, final Object value) {
-        MDC.put(key, String.valueOf(value));
+    public Object putMdc(final String key, final Object value) {
+        return MDC.put(key, String.valueOf(value));
     }
 
     public Object getMdc(final String key) {

Modified: jboss-logging/trunk/src/main/java/org/jboss/logging/Log4jLoggerProvider.java
===================================================================
--- jboss-logging/trunk/src/main/java/org/jboss/logging/Log4jLoggerProvider.java	2010-02-19 01:14:50 UTC (rev 4045)
+++ jboss-logging/trunk/src/main/java/org/jboss/logging/Log4jLoggerProvider.java	2010-02-22 17:13:25 UTC (rev 4046)
@@ -42,8 +42,12 @@
         return MDC.getContext();
     }
 
-    public void putMdc(String key, Object val) {
-        MDC.put(key, val);
+    public Object putMdc(String key, Object val) {
+        try {
+            return MDC.get(key);
+        } finally {
+            MDC.put(key, val);
+        }
     }
 
     public void removeMdc(String key) {

Modified: jboss-logging/trunk/src/main/java/org/jboss/logging/LoggerProvider.java
===================================================================
--- jboss-logging/trunk/src/main/java/org/jboss/logging/LoggerProvider.java	2010-02-19 01:14:50 UTC (rev 4045)
+++ jboss-logging/trunk/src/main/java/org/jboss/logging/LoggerProvider.java	2010-02-22 17:13:25 UTC (rev 4046)
@@ -27,7 +27,7 @@
 public interface LoggerProvider {
     Logger getLogger(String name, String resourceBundleName, String prefix);
 
-    void putMdc(String key, Object value);
+    Object putMdc(String key, Object value);
 
     Object getMdc(String key);
 

Modified: jboss-logging/trunk/src/main/java/org/jboss/logging/MDC.java
===================================================================
--- jboss-logging/trunk/src/main/java/org/jboss/logging/MDC.java	2010-02-19 01:14:50 UTC (rev 4045)
+++ jboss-logging/trunk/src/main/java/org/jboss/logging/MDC.java	2010-02-22 17:13:25 UTC (rev 4046)
@@ -29,8 +29,8 @@
     private MDC() {
     }
 
-    public static void put(String key, Object val) {
-        LoggerProviders.PROVIDER.putMdc(key, val);
+    public static Object put(String key, Object val) {
+        return LoggerProviders.PROVIDER.putMdc(key, val);
     }
 
     public static Object get(String key) {

Modified: jboss-logging/trunk/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java
===================================================================
--- jboss-logging/trunk/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java	2010-02-19 01:14:50 UTC (rev 4045)
+++ jboss-logging/trunk/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java	2010-02-22 17:13:25 UTC (rev 4046)
@@ -38,8 +38,16 @@
         }
     }
 
-    public void putMdc(final String key, final Object value) {
-        MDC.put(key, String.valueOf(value));
+    public Object putMdc(final String key, final Object value) {
+        try {
+            return MDC.get(key);
+        } finally {
+            if (value == null) {
+                MDC.remove(key);
+            } else {
+                MDC.put(key, String.valueOf(value));
+            }
+        }
     }
 
     public Object getMdc(final String key) {