1 files changed, 26 insertions, 24 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AuthenticationSessionStoreage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AuthenticationSessionStoreage.java
index 829383cb4..d1582b883 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AuthenticationSessionStoreage.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AuthenticationSessionStoreage.java
@@ -693,19 +693,20 @@ public class AuthenticationSessionStoreage {
 				  
 				  //send transaction
 				  tx.commit();
+			  			  
+				  Logger.trace("Found entries: " + result.size());
+				  
+				  //Assertion requires an unique artifact
+				  if (result.size() != 1) {
+					 Logger.trace("No entries found.");
+					 return false;
+							 
+				  } else {
+					  cleanDelete(result.get(0));
+					  return true;
+				  }
 			  }
 			  
-			  Logger.trace("Found entries: " + result.size());
-			  
-			  //Assertion requires an unique artifact
-			  if (result.size() != 1) {
-				 Logger.trace("No entries found.");
-				 return false;
-						 
-			  } else {
-				  cleanDelete(result.get(0));
-				  return true;
-			  }
 		  } catch (Exception e) {
 				if (tx != null && !tx.wasCommitted())
 					tx.rollback();
@@ -1024,21 +1025,22 @@ public class AuthenticationSessionStoreage {
 				query.setTimestamp("timeoutupdate", expioredateupdate);
 				results = query.list();
 				tx.commit();
-			}
-			
-			if (results.size() != 0) {
-				for(AuthenticatedSessionStore result : results) {
-					try { 
-						cleanDelete(result);
-						Logger.info("Authenticated session with sessionID=" + result.getSessionid() 
-								+ " after session timeout.");
 					
-					} catch (HibernateException e){
-						Logger.warn("Authenticated session with sessionID=" + result.getSessionid() 
-								+ " not removed after timeout! (Error during Database communication)", e);
-					}
-				}	
+				if (results.size() != 0) {
+					for(AuthenticatedSessionStore result : results) {
+						try { 
+							cleanDelete(result);
+							Logger.info("Authenticated session with sessionID=" + result.getSessionid() 
+									+ " after session timeout.");
+						
+						} catch (HibernateException e){
+							Logger.warn("Authenticated session with sessionID=" + result.getSessionid() 
+									+ " not removed after timeout! (Error during Database communication)", e);
+						}
+					}	
+				}
 			}
+			
 		} catch (Exception e) {
 			if (tx != null && !tx.wasCommitted())
 				tx.rollback();