1 files changed, 14 insertions, 8 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java
index 7b5c1513a..e07be8420 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java
@@ -144,6 +144,12 @@ public class VerifyCertificateServlet extends AuthServlet {
 	    		// verify certificate for OrganWalter
 	    		String createXMLSignatureRequestOrRedirect = AuthenticationServer.getInstance().verifyCertificate(session, cert);
 	    		
+		    	try {
+					AuthenticationSessionStoreage.storeSession(session);
+				} catch (MOADatabaseException e) {
+					throw new MOAIDException("session store error", null);
+				}
+	    		
 	    		ServletUtils.writeCreateXMLSignatureRequestOrRedirect(resp, session, createXMLSignatureRequestOrRedirect, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink");
 	    	}
 	    	else {
@@ -156,19 +162,19 @@ public class VerifyCertificateServlet extends AuthServlet {
 	               session.getAuthURL(),
 	               REQ_GET_FOREIGN_ID,
 	               session.getSessionID());
-	       
+	       
+		    	try {
+					AuthenticationSessionStoreage.storeSession(session);
+				} catch (MOADatabaseException e) {
+					throw new MOAIDException("session store error", null);
+				}
+		    	
 		    	ServletUtils.writeCreateXMLSignatureRequest(resp, session, createXMLSignatureRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "GetForeignID", dataurl);
 		    	
 		    	
 		    	Logger.debug("Send CreateXMLSignatureRequest to BKU");
 	    	}
-	    	
-	    	try {
-				AuthenticationSessionStoreage.storeSession(session);
-			} catch (MOADatabaseException e) {
-				throw new MOAIDException("session store error", null);
-			}
-	    	   		      
+	    		    	 
 	    }
 	    catch (MOAIDException ex) {
 	      handleError(null, ex, req, resp);