fix wrong error handling and missing TransactionId in case of an error during restart of process-engine (OEGVEID-2053)

3 files changed, 13 insertions, 15 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/RestartAuthProzessManagement.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/RestartAuthProzessManagement.java
index c3f3d32e..7a664915 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/RestartAuthProzessManagement.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/RestartAuthProzessManagement.java
@@ -30,6 +30,7 @@ import org.springframework.stereotype.Component;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
 import at.gv.egiz.eaaf.core.api.idp.process.ProcessEngine;
 import at.gv.egiz.eaaf.core.exceptions.EaafException;
+import at.gv.egiz.eaaf.core.exceptions.ProcessExecutionException;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
 import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
 import at.gv.egiz.eaaf.core.impl.idp.auth.modules.ModuleRegistration;
@@ -107,10 +108,18 @@ public class RestartAuthProzessManagement extends AbstractAuthServletTask {
         processEngine.start(pendingReq);
 
       }
-
-    } catch (final EaafException e) {
-      throw new TaskExecutionException(pendingReq, e.getMessage(), e);
-
+      
+    } catch (final ProcessExecutionException e) {
+      //check if Task in already selected process failed or if process selection failed
+      if (e.getCause() != null && e.getCause() instanceof TaskExecutionException) {
+        log.info("New process was started, but one Task in process failed. Reason: {}", e.getMessage());
+        throw (TaskExecutionException)e.getCause();
+        
+      } else {
+        throw new TaskExecutionException(pendingReq, e.getMessage(), e);
+        
+      }
+           
     } catch (final Exception e) {
       log.warn("RestartAuthProzessManagement has an internal error", e);
       throw new TaskExecutionException(pendingReq, e.getMessage(), e);
diff --git a/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractCreateQualEidRequestTask.java b/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractCreateQualEidRequestTask.java
index 1c1a8f78..b558fcf9 100644
--- a/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractCreateQualEidRequestTask.java
+++ b/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractCreateQualEidRequestTask.java
@@ -37,7 +37,6 @@ import at.gv.egiz.eaaf.core.impl.http.IHttpClientFactory;
 import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
 import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils;
 import at.gv.egiz.eaaf.core.impl.utils.Random;
-import at.gv.egiz.eaaf.core.impl.utils.TransactionIdUtils;
 import at.gv.egiz.eaaf.modules.auth.sl20.Constants;
 import at.gv.egiz.eaaf.modules.auth.sl20.EventCodes;
 import at.gv.egiz.eaaf.modules.auth.sl20.data.VerificationResult;
@@ -214,10 +213,6 @@ public abstract class AbstractCreateQualEidRequestTask extends AbstractAuthServl
       log.warn("SL2.0 Authentication FAILED with a generic error.", e);
       throw new TaskExecutionException(pendingReq, e.getMessage(), e);
 
-    } finally {
-      TransactionIdUtils.removeTransactionId();
-      TransactionIdUtils.removeSessionId();
-
     }
 
   }
diff --git a/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractReceiveQualEidTask.java b/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractReceiveQualEidTask.java
index 84ad06e7..dfa05a89 100644
--- a/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractReceiveQualEidTask.java
+++ b/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractReceiveQualEidTask.java
@@ -20,7 +20,6 @@ import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
 import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
 import at.gv.egiz.eaaf.core.impl.utils.DataUrlBuilder;
 import at.gv.egiz.eaaf.core.impl.utils.StreamUtils;
-import at.gv.egiz.eaaf.core.impl.utils.TransactionIdUtils;
 import at.gv.egiz.eaaf.modules.auth.sl20.Constants;
 import at.gv.egiz.eaaf.modules.auth.sl20.EventCodes;
 import at.gv.egiz.eaaf.modules.auth.sl20.data.VerificationResult;
@@ -211,11 +210,6 @@ public abstract class AbstractReceiveQualEidTask extends AbstractAuthServletTask
         log.error("Can NOT send error message. SOMETHING IS REALY WRONG!", e);
 
       }
-
-    } finally {
-      TransactionIdUtils.removeTransactionId();
-      TransactionIdUtils.removeSessionId();
-
     }
   }