1 files changed, 4 insertions, 2 deletions
diff --git a/common/src/main/java/org/onap/so/logging/jaxrs/filter/MDCTaskDecorator.java b/common/src/main/java/org/onap/so/logging/jaxrs/filter/MDCTaskDecorator.java
index cc2ccb5c2e..9624dcd578 100644
--- a/common/src/main/java/org/onap/so/logging/jaxrs/filter/MDCTaskDecorator.java
+++ b/common/src/main/java/org/onap/so/logging/jaxrs/filter/MDCTaskDecorator.java
@@ -32,8 +32,10 @@ public class MDCTaskDecorator implements TaskDecorator {
     Map<String, String> contextMap = MDC.getCopyOfContextMap();
     return () -> {
       try {
-        MDC.setContextMap(contextMap);
-        runnable.run();
+    	if(contextMap!=null){
+	        MDC.setContextMap(contextMap);
+	        runnable.run();
+    	}
       } finally {
         MDC.clear();
       }