Merge pull request #10 from HeshanSudarshana/main-add-NPE-fix

[Fixes #529] Prevent NPE when context map is null
wso2 · Mar 1, 2024 · d6b30af · d6b30af
2 parents a447ca1 + eba76c6
commit d6b30af
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pax-logging-api/src/main/java/org/ops4j/pax/logging/slf4j/Slf4jMDCAdapter.java b/pax-logging-api/src/main/java/org/ops4j/pax/logging/slf4j/Slf4jMDCAdapter.java
@@ -17,6 +17,7 @@
  */
 package org.ops4j.pax.logging.slf4j;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.HashMap;
 import java.util.Map;
@@ -88,6 +89,9 @@ public void clear() {
     public Map<String, String> getCopyOfContextMap() {
         Map<String, Object> copy = getContext().getCopyOfContextMap();
         Map<String, String> result = new HashMap<>();
+        if (copy == null) {
+            return Collections.emptyMap();
+        }
         copy.forEach((k, v) -> {
             if (v instanceof String) {
                 result.put(k, (String) v);