fix missing "transactionID" injection in protocol-finalization and error-handler steps

1 files changed, 13 insertions, 1 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java
index 9511f46e..4ff41836 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java
@@ -41,6 +41,7 @@ import at.gv.egiz.eaaf.core.api.data.EaafConstants;
 import at.gv.egiz.eaaf.core.api.data.ExceptionContainer;
 import at.gv.egiz.eaaf.core.api.utils.IPendingRequestIdGenerationStrategy;
 import at.gv.egiz.eaaf.core.exceptions.EaafException;
+import at.gv.egiz.eaaf.core.impl.utils.TransactionIdUtils;
 
 /**
  * Protocol finialization end-point.
@@ -98,6 +99,9 @@ public class ProtocolFinalizationController extends AbstractController {
             pendingReq = container.getPendingRequest();
 
             if (pendingReq != null) {
+              //set MDC variables
+              TransactionIdUtils.setAllLoggingVariables(pendingReq);
+              
               // build protocol-specific error message if possible
               protAuthService.buildProtocolSpecificErrorResponse(throwable, req, resp, pendingReq);
 
@@ -136,6 +140,9 @@ public class ProtocolFinalizationController extends AbstractController {
               pendingReq.getUniqueTransactionIdentifier());
 
         }
+        
+        //remove all Logger variables
+        TransactionIdUtils.removeAllLoggingVariables();
 
       }
 
@@ -174,9 +181,14 @@ public class ProtocolFinalizationController extends AbstractController {
           req, resp, false);
 
     } else {
+      //set MDC variables
+      TransactionIdUtils.setAllLoggingVariables(pendingReq);
+      
+      //perform protocol finalization steps
       protAuthService.finalizeAuthentication(req, resp, pendingReq);
+                  
     }
-
+    
   }
 
 }