add exact timeout validation for SSO sessions

1 files changed, 16 insertions, 17 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/IDPSingleLogOutServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/IDPSingleLogOutServlet.java
index a7ec4dcb6..c08d77f12 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/IDPSingleLogOutServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/IDPSingleLogOutServlet.java
@@ -97,32 +97,31 @@ public class IDPSingleLogOutServlet extends AuthServlet {
 			
 			return;			
 					
-		} else if (MiscUtil.isNotEmpty(ssoid)) {			
-			if (ssomanager.isValidSSOSession(ssoid, null)) {
+		} else if (MiscUtil.isNotEmpty(ssoid)) {
+			try {
+				if (ssomanager.isValidSSOSession(ssoid, null)) {
 				
-				AuthenticationManager authmanager = AuthenticationManager.getInstance();
-				String moaSessionID = AuthenticationSessionStoreage.getMOASessionSSOID(ssoid);
+					AuthenticationManager authmanager = AuthenticationManager.getInstance();
+					String moaSessionID = AuthenticationSessionStoreage.getMOASessionSSOID(ssoid);
 
-				if (MiscUtil.isNotEmpty(moaSessionID)) {
-					AuthenticationSession authSession;
-					try {
-						authSession = AuthenticationSessionStoreage
+					if (MiscUtil.isNotEmpty(moaSessionID)) {					
+						AuthenticationSession authSession = AuthenticationSessionStoreage
 								.getSession(moaSessionID);
 						if(authSession != null) {
 							authmanager.performSingleLogOut(req, resp, authSession, null);
 							return;
 							
 						}
-						
-					} catch (MOADatabaseException e) {
-						//TODO: insert error Handling
-						
-					} catch (MOAIDException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
 					}
-				}				
-			}
+				}
+			} catch (MOADatabaseException e) {
+				//TODO: insert error Handling
+				e.printStackTrace();
+				
+			} catch (MOAIDException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}				
 			
 		} else if (restartProcessObj != null && restartProcessObj instanceof String) {
 			String restartProcess = (String) restartProcessObj;