Enhancements for the aai-common library

[aai/aai-common.git] / aai-core / src / main / java / org / onap / aai / concurrent / AaiCallable.java

diff --git a/aai-core/src/main/java/org/onap/aai/concurrent/AaiCallable.java b/aai-core/src/main/java/org/onap/aai/concurrent/AaiCallable.java
index 6ea67b9..69560ec 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/concurrent/AaiCallable.java
+++ b/aai-core/src/main/java/org/onap/aai/concurrent/AaiCallable.java
@@ -44,7 +44,9 @@ public abstract class AaiCallable<T> implements Callable<T> {
      * The call method
      */
     public T call() throws Exception {
-        MDC.setContextMap(mdcCopy);
+        if ( mdcCopy != null ) {
+            MDC.setContextMap(mdcCopy);
+        }
         return process();
     }