fix SLF4J-563

Signed-off-by: Ceki Gulcu <ceki@qos.ch>
qos-ch · Sep 20, 2022 · 894b189 · 894b189
1 parent 7c1d86e
commit 894b189
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/slf4j-reload4j/src/main/java/org/slf4j/reload4j/Reload4jMDCAdapter.java b/slf4j-reload4j/src/main/java/org/slf4j/reload4j/Reload4jMDCAdapter.java
@@ -96,7 +96,7 @@ public void setContextMap(Map<String, String> contextMap) {
 
         if (old == null) {
             for (Map.Entry<String, String> mapEntry : contextMap.entrySet()) {
-                org.apache.log4j.MDC.put(mapEntry.getKey(), mapEntry);
+                org.apache.log4j.MDC.put(mapEntry.getKey(), mapEntry.getValue());
             }
         } else {
             old.clear();

diff --git a/slf4j-reload4j/src/test/java/org/slf4j/reload4j/Reload4jMDCAdapterTest.java b/slf4j-reload4j/src/test/java/org/slf4j/reload4j/Reload4jMDCAdapterTest.java
@@ -1,12 +1,14 @@
 package org.slf4j.reload4j;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 import org.junit.Test;
 import org.slf4j.helpers.MDCAdapterTestBase;
 import org.slf4j.spi.MDCAdapter;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
 public class Reload4jMDCAdapterTest extends MDCAdapterTestBase {
 
     protected MDCAdapter instantiateMDC() {
@@ -22,6 +24,16 @@ public void testClearingMDC() {
         assertTrue(mdc.getCopyOfContextMap().isEmpty());
     }
 
+    @Test
+    public void testSetContextMap() {
+        Map<String, String> map0 = new HashMap<>();
+        map0.put("key0", "val0");
+
+        mdc.setContextMap(map0);
+        Map map1 = mdc.getCopyOfContextMap();
+
+        assertEquals(map0, map1);
+    }
 
 
 }