fix possible DB cleanup errors

3 files changed, 56 insertions, 54 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AssertionStorage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AssertionStorage.java
index 704adc80d..3b97f3b08 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AssertionStorage.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AssertionStorage.java
@@ -145,22 +145,22 @@ public class AssertionStorage {
 			query.setTimestamp("timeout", expioredate);		
 			results = query.list();
 			session.getTransaction().commit();
-		}
-		
-		if (results.size() != 0) {
-			for(AssertionStore result : results) {
-				try { 
-					cleanDelete(result);
-					Logger.info("Remove stored information with ID: " + result.getArtifact() 
-							+ " after timeout.");
 				
-				} catch (HibernateException e){
-					Logger.warn("Sessioninformation with ID=" + result.getArtifact() 
-							+ " not removed after timeout! (Error during Database communication)", e);
-				}
-
-			}	
-		}	
+			if (results.size() != 0) {
+				for(AssertionStore result : results) {
+					try { 
+						cleanDelete(result);
+						Logger.info("Remove stored information with ID: " + result.getArtifact() 
+								+ " after timeout.");
+					
+					} catch (HibernateException e){
+						Logger.warn("Sessioninformation with ID=" + result.getArtifact() 
+								+ " not removed after timeout! (Error during Database communication)", e);
+					}
+	
+				}	
+			}
+		}
 	}
 	 
 	public void remove(String artifact) {
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();
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/DBExceptionStoreImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/DBExceptionStoreImpl.java
index 054ad1014..4cddd141b 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/DBExceptionStoreImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/DBExceptionStoreImpl.java
@@ -126,22 +126,22 @@ public class DBExceptionStoreImpl implements IExceptionStore {
 			query.setTimestamp("timeout", expioredate);		
 			results = query.list();
 			session.getTransaction().commit();
-		}
-		
-		if (results.size() != 0) {
-			for(ExceptionStore result : results) {
-				try { 
-					MOASessionDBUtils.delete(result);
-					Logger.info("Remove Exception with ID=" + result.getExid() 
-							+ " after timeout.");
 				
-				} catch (HibernateException e){
-					Logger.warn("Exception with ID=" + result.getExid() 
-							+ " not removed after timeout! (Error during Database communication)", e);
-				}
-
-			}	
-		}	
+			if (results.size() != 0) {
+				for(ExceptionStore result : results) {
+					try { 
+						MOASessionDBUtils.delete(result);
+						Logger.info("Remove Exception with ID=" + result.getExid() 
+								+ " after timeout.");
+					
+					} catch (HibernateException e){
+						Logger.warn("Exception with ID=" + result.getExid() 
+								+ " not removed after timeout! (Error during Database communication)", e);
+					}
+	
+				}	
+			}
+		}
 	}
 	
 	@SuppressWarnings("rawtypes")