update TransactionUtis for MDC logging and add unique OA identifier as additional MDC variable

1 files changed, 21 insertions, 3 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/ExceptionContainer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/ExceptionContainer.java
index 1c6fdcb65..4820b6fdc 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/ExceptionContainer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/ExceptionContainer.java
@@ -24,6 +24,8 @@ package at.gv.egovernment.moa.id.data;
 
 import java.io.Serializable;
 
+import at.gv.egovernment.moa.id.commons.api.IRequest;
+
 /**
  * @author tlenz
  *
@@ -34,13 +36,21 @@ public class ExceptionContainer implements Serializable {
 	private Throwable exceptionThrown = null;
 	private String uniqueSessionID = null;
 	private String uniqueTransactionID = null;
+	private String uniqueServiceProviderId = null;
 	
 	/**
 	 * 
 	 */
-	public ExceptionContainer(String uniqueSessionID, String uniqueTransactionID, Throwable exception) {
-		this.uniqueSessionID = uniqueSessionID;
-		this.uniqueTransactionID = uniqueTransactionID;
+	public ExceptionContainer(IRequest pendingReq, Throwable exception) {
+		if (pendingReq != null) {
+			this.uniqueSessionID = pendingReq.getUniqueSessionIdentifier();
+			this.uniqueTransactionID = pendingReq.getUniqueTransactionIdentifier();
+		
+			if (pendingReq.getOnlineApplicationConfiguration() != null)
+				this.uniqueServiceProviderId = pendingReq.getOnlineApplicationConfiguration().getPublicURLPrefix();
+			
+		}
+		
 		this.exceptionThrown = exception;		
 	}
 	
@@ -62,6 +72,14 @@ public class ExceptionContainer implements Serializable {
 	public String getUniqueTransactionID() {
 		return uniqueTransactionID;
 	}
+
+	/**
+	 * @return the uniqueServiceProviderId
+	 */
+	public String getUniqueServiceProviderId() {
+		return uniqueServiceProviderId;
+	}
+