fix NPE for older slf4j versions, remove added values

Mercateo · Apr 18, 2024 · 9b74b0c · 9b74b0c
1 parent 74d3445
commit 9b74b0c
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/main/java/com/mercateo/sqs/utils/message/handling/LongRunningMessageHandler.java b/src/main/java/com/mercateo/sqs/utils/message/handling/LongRunningMessageHandler.java
@@ -87,8 +87,16 @@ public class LongRunningMessageHandler<I, O> {
             public Future<?> submit(Runnable task) {
                 Map<String, String> current = MDC.getCopyOfContextMap();
                 return super.submit(() -> {
-                    MDC.setContextMap(current);
-                    task.run();
+                    try {
+                        if (current != null) {
+                            current.forEach(MDC::put);
+                        }
+                        task.run();
+                    } finally {
+                        if (current != null) {
+                            current.keySet().forEach(MDC::remove);
+                        }
+                    }
                 });
             }
         };