1 files changed, 14 insertions, 5 deletions
diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/TransactionIdUtils.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/TransactionIdUtils.java
index 4c1601c0..d1613d16 100644
--- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/TransactionIdUtils.java
+++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/TransactionIdUtils.java
@@ -21,7 +21,10 @@ package at.gv.egiz.eaaf.core.impl.utils;
 
 import java.util.UUID;
 
+import javax.annotation.Nullable;
+
 import at.gv.egiz.eaaf.core.api.IRequest;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Transaction Identifier Utils.
@@ -29,6 +32,7 @@ import at.gv.egiz.eaaf.core.api.IRequest;
  * @author tlenz
  *
  */
+@Slf4j
 public class TransactionIdUtils {
 
   /**
@@ -58,11 +62,16 @@ public class TransactionIdUtils {
    *
    * @param pendingRequest Http request object
    */
-  public static void setAllLoggingVariables(final IRequest pendingRequest) {
-    setTransactionId(pendingRequest.getUniqueTransactionIdentifier());
-    setSessionId(pendingRequest.getUniqueSessionIdentifier());
-    setServiceProviderId(pendingRequest.getServiceProviderConfiguration().getUniqueIdentifier());
-
+  public static void setAllLoggingVariables(@Nullable final IRequest pendingRequest) {
+    if (pendingRequest != null) {
+      setTransactionId(pendingRequest.getUniqueTransactionIdentifier());
+      setSessionId(pendingRequest.getUniqueSessionIdentifier());
+      setServiceProviderId(pendingRequest.getServiceProviderConfiguration().getUniqueIdentifier());
+      
+    } else {
+      log.warn("Can NOT set MDC variables from pendingRequest because it is 'null'");
+      
+    }
   }
 
   /**