fix problems with reversion log

2 files changed, 11 insertions, 1 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/PrepareGetMISMandateTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/PrepareGetMISMandateTask.java
index 132fa927f..099bc085c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/PrepareGetMISMandateTask.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/PrepareGetMISMandateTask.java
@@ -46,6 +46,7 @@ import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
 import at.gv.egovernment.moa.id.config.ConnectionParameter;
 import at.gv.egovernment.moa.id.config.auth.AuthConfiguration;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProviderFactory;
+import at.gv.egovernment.moa.id.config.auth.IOAAuthParameters;
 import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
 import at.gv.egovernment.moa.id.moduls.IRequest;
 import at.gv.egovernment.moa.id.moduls.RequestStorage;
@@ -127,7 +128,13 @@ public class PrepareGetMISMandateTask extends AbstractAuthServletTask {
 			    newMOASessionID);
 			
 	        String oaURL = session.getOAURLRequested();
-	        OAAuthParameter oaParam = authConf.getOnlineApplicationParameter(oaURL);
+	        IOAAuthParameters oaParam = pendingReq.getOnlineApplicationConfiguration();
+	        if (oaParam == null) {
+	        	oaParam = authConf.getOnlineApplicationParameter(oaURL);
+	        	Logger.info("No Service info in PendingRequest --> load service info from configuration");
+	        	
+	        }
+	        
 	        List<String> profiles = oaParam.getMandateProfiles();
 
 	        if (profiles == null) {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyAuthenticationBlockTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyAuthenticationBlockTask.java
index 6a30e40c1..da464ba68 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyAuthenticationBlockTask.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyAuthenticationBlockTask.java
@@ -129,6 +129,9 @@ public class VerifyAuthenticationBlockTask extends AbstractAuthServletTask {
 				

 				AuthenticationServer.getInstance().verifyAuthenticationBlock(pendingReq, session, createXMLSignatureResponse);

 				

+				//store all changes in session DAO

+				AuthenticationSessionStoreage.storeSession(session);

+				

 				//put session to context 

 				executionContext.put(PARAM_SESSIONID, session.getSessionID());