From 2a1c492d7ca2c71507ade35512f30fba40e4b64f Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Thu, 5 Aug 2021 08:38:22 +0200
Subject: fix wrong error handling and missing TransactionId in case of an
 error during restart of process-engine (OEGVEID-2053)

---
 .../modules/auth/sl20/tasks/AbstractCreateQualEidRequestTask.java   | 5 -----
 .../eaaf/modules/auth/sl20/tasks/AbstractReceiveQualEidTask.java    | 6 ------
 2 files changed, 11 deletions(-)

(limited to 'eaaf_modules')

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();
-
     }
   }
 
-- 
cgit v1.2.3