From f45ab9ff37a33b5c92204f9a8dc91c60a0fb136e Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 24 Jul 2015 12:26:29 +0200
Subject: move position of revisionslog entry

---
 .../egovernment/moa/id/entrypoints/DispatcherServlet.java | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'id/server/idserverlib/src/main/java')

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
index 71ba69173..f7b6b8dde 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
@@ -286,10 +286,12 @@ public class DispatcherServlet extends AuthServlet{
 						//log information for security and process reversion
 						MOAReversionLogger.getInstance().logEvent(MOAIDEventConstants.SESSION_CREATED, uniqueSessionIdentifier);
 						MOAReversionLogger.getInstance().logEvent(MOAIDEventConstants.TRANSACTION_CREATED, protocolRequestID);						
-						MOAReversionLogger.getInstance().logEvent(uniqueSessionIdentifier, protocolRequestID, MOAIDEventConstants.TRANSACTION_IP, req.getRemoteAddr());
-												
+						MOAReversionLogger.getInstance().logEvent(uniqueSessionIdentifier, protocolRequestID, MOAIDEventConstants.TRANSACTION_IP, req.getRemoteAddr());						
 						protocolRequest = info.preProcess(req, resp, action, uniqueSessionIdentifier, protocolRequestID);
 						
+						MOAReversionLogger.getInstance().logEvent(protocolRequest.getOnlineApplicationConfiguration(), 
+								protocolRequest, MOAIDEventConstants.AUTHPROTOCOL_TYPE, protocolRequest.requestedModule());
+						
 						//request is a valid interfederation response 
 						if (protocolRequest != null && 
 								protocolRequest.getInterfederationResponse() != null ) {							
@@ -402,10 +404,7 @@ public class DispatcherServlet extends AuthServlet{
 				boolean needAuthentication = moduleAction.needAuthentication(protocolRequest, req, resp);				
 				
 				if (needAuthentication) {
-					
-					MOAReversionLogger.getInstance().logEvent(protocolRequest.getOnlineApplicationConfiguration(), 
-							protocolRequest, MOAIDEventConstants.AUTHPROCESS_SERVICEPROVIDER, protocolRequest.getOAURL());
-					
+										
 					//check if interfederation IDP is requested
 					ssomanager.checkInterfederationIsRequested(req, resp, protocolRequest);
 					
@@ -455,8 +454,8 @@ public class DispatcherServlet extends AuthServlet{
 								protocolRequest, MOAIDEventConstants.AUTHPROCESS_FINISHED);
 					else
 						MOAReversionLogger.getInstance().logEvent(protocolRequest.getOnlineApplicationConfiguration(), 
-								protocolRequest, MOAIDEventConstants.AUTHPROTOCOL_TYPE, protocolRequest.requestedModule());
-					
+								protocolRequest, MOAIDEventConstants.AUTHPROCESS_SERVICEPROVIDER, protocolRequest.getOAURL());
+										
 					if (protocolRequest.forceAuth()) {	
 						if (!tryperform) {
 							authmanager.doAuthentication(req, resp,
-- 
cgit v1.2.3