1 files changed, 18 insertions, 13 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/AbstractController.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/AbstractController.java
index 58c8c0a9..0479a8c5 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/AbstractController.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/AbstractController.java
@@ -26,6 +26,14 @@ import javax.annotation.Nullable;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.text.StringEscapeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.util.SerializationUtils;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
 import at.gv.egiz.components.eventlog.api.EventConstants;
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.api.IStatusMessenger;
@@ -35,20 +43,12 @@ import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
 import at.gv.egiz.eaaf.core.api.idp.auth.services.IProtocolAuthenticationService;
 import at.gv.egiz.eaaf.core.api.logging.IRevisionLogger;
 import at.gv.egiz.eaaf.core.api.storage.ITransactionStorage;
+import at.gv.egiz.eaaf.core.api.utils.IPendingRequestIdGenerationStrategy;
 import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.core.exceptions.PendingReqIdValidationException;
 import at.gv.egiz.eaaf.core.exceptions.ProcessExecutionException;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
 import at.gv.egiz.eaaf.core.impl.data.Pair;
-import at.gv.egiz.eaaf.core.impl.utils.Random;
-
-import org.apache.commons.text.StringEscapeUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.util.SerializationUtils;
-import org.springframework.web.bind.annotation.ExceptionHandler;
 
 /**
  * Basic application controller that implements core error-handling.
@@ -74,6 +74,9 @@ public abstract class AbstractController {
   @Autowired
   protected IRevisionLogger revisionsLogger;
 
+  @Autowired
+  protected IPendingRequestIdGenerationStrategy reqIdGenerationStrategy;
+  
   /**
    * EAAF framework exception handler.
    *
@@ -168,7 +171,9 @@ public abstract class AbstractController {
     }
 
     // put exception into transaction store for redirect
-    final String errorKey = Random.nextLongRandom();
+    final String errorToken = reqIdGenerationStrategy.generateExternalPendingRequestId();    
+    final String errorKey = reqIdGenerationStrategy.getPendingRequestIdWithOutChecks(errorToken);
+            
     if (errorToHandle.getFirst() != null) {
       revisionsLogger.logEvent(errorToHandle.getFirst(), EventConstants.TRANSACTION_ERROR);
 
@@ -176,7 +181,7 @@ public abstract class AbstractController {
       final byte[] serializedError = SerializationUtils.serialize(
           new ExceptionContainer(errorToHandle.getFirst(), errorToHandle.getSecond()));
 
-      log.trace("Put 'ExceptionContainer' into cache ... ");
+      log.debug("Put 'ExceptionContainer' into cache with id: {}... ", errorKey);
       transactionStorage.put(errorKey, serializedError, -1);
 
     } else {
@@ -184,12 +189,12 @@ public abstract class AbstractController {
       final byte[] serializedError = SerializationUtils.serialize(
           new ExceptionContainer(null, errorToHandle.getSecond()));
 
-      log.trace("Put 'ExceptionContainer' into cache ... ");
+      log.trace("Put 'ExceptionContainer' into cache with id: {}... ",errorKey);
       transactionStorage.put(errorKey, serializedError, -1);
 
     }
 
-    return errorKey;
+    return errorToken;
 
   }