fix bugs in SSO session-transfer modul

1 files changed, 12 insertions, 4 deletions

diff --git a/id/server/modules/moa-id-module-ssoTransfer/src/main/java/at/gv/egovernment/moa/id/auth/modules/ssotransfer/task/RestoreSSOSessionTask.java b/id/server/modules/moa-id-module-ssoTransfer/src/main/java/at/gv/egovernment/moa/id/auth/modules/ssotransfer/task/RestoreSSOSessionTask.java
index 9521f264e..6ba29fe3a 100644
--- a/id/server/modules/moa-id-module-ssoTransfer/src/main/java/at/gv/egovernment/moa/id/auth/modules/ssotransfer/task/RestoreSSOSessionTask.java
+++ b/id/server/modules/moa-id-module-ssoTransfer/src/main/java/at/gv/egovernment/moa/id/auth/modules/ssotransfer/task/RestoreSSOSessionTask.java
@@ -88,6 +88,17 @@ public class RestoreSSOSessionTask extends AbstractAuthServletTask {
 			
 		}
 		 
+    	//session is valid --> load MOASession object
+    	try {
+			defaultTaskInitialization(request, executionContext);
+						
+		} catch (MOAIDException | MOADatabaseException e1) {
+			Logger.error("Database Error! MOASession is not stored!");
+			throw new TaskExecutionException(pendingReq, "Load MOASession FAILED.", e1);
+			
+		}
+
+		
 		if (MiscUtil.isNotEmpty(receivedPostMessage)) {
 			Logger.debug("Receive POST-Message data. Start data-validation process ... ");
 			try {
@@ -105,10 +116,7 @@ public class RestoreSSOSessionTask extends AbstractAuthServletTask {
 			    if (PVPConfiguration.getInstance().getIDPPublicPath().contains(entityID)) {
 			    	// stored SSO session data is from this IDP - start local session reconstruction
 			    	Response ssoInformation = ssoTransferUtils.validateReceivedSSOContainer(sessionBlob);
-			    	
-			    	//session is valid --> load MOASession object
-			    	defaultTaskInitialization(request, executionContext);
-			    	
+			    				    	
 			    	//transfer SSO Assertion into MOA-Session
 			    	ssoTransferUtils.parseSSOContainerToMOASessionDataObject(pendingReq, moasession, ssoInformation);