+ better worker context switch

elf4j · Apr 26, 2024 · da046a3 · da046a3
1 parent e1d2a6b
commit da046a3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
 
     <groupId>io.github.elf4j</groupId>
     <artifactId>elf4j-engine</artifactId>
-    <version>15.2.3</version>
+    <version>15.2.4</version>
     <packaging>jar</packaging>
     <name>elf4j-engine</name>
     <description>A stand-alone Java log engine implementing the ELF4J (Easy Logging Facade for Java) API</description>

diff --git a/src/main/java/elf4j/engine/service/writer/GroupWriter.java b/src/main/java/elf4j/engine/service/writer/GroupWriter.java
@@ -118,19 +118,17 @@ private static List<LogWriterType> getLogWriterTypes(@NonNull LogServiceConfigur
                 .collect(Collectors.toList());
     }
 
-    private static Runnable withMdcContext(Runnable task) {
+    private static @NonNull Runnable withMdcContext(Runnable task) {
         Map<String, String> callerContext = MDC.getCopyOfContextMap();
-        return (callerContext == null || callerContext.isEmpty())
-                ? task
-                : () -> {
-                    Map<String, String> workerContext = replaceContextWith(callerContext);
-                    MDC.setContextMap(callerContext);
-                    try {
-                        task.run();
-                    } finally {
-                        MDC.setContextMap(workerContext);
-                    }
-                };
+        return () -> {
+            Map<String, String> workerContext = replaceContextWith(callerContext);
+            MDC.setContextMap(callerContext);
+            try {
+                task.run();
+            } finally {
+                MDC.setContextMap(workerContext);
+            }
+        };
     }
 
     private static Map<String, String> replaceContextWith(Map<String, String> targetContext) {