1 files changed, 26 insertions, 8 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 27f219452..ca5cb9226 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
@@ -156,7 +156,7 @@ public class AuthenticationSessionStoreage {
 	
 	public static void destroySession(String moaSessionID) throws MOADatabaseException {
 		
-		  Session session = MOASessionDBUtils.getCurrentSession();
+		Session session = MOASessionDBUtils.getCurrentSession();
 		  
 		  List<AuthenticatedSessionStore> result;
 		  
@@ -176,11 +176,11 @@ public class AuthenticationSessionStoreage {
 			   	throw new MOADatabaseException("No session found with this sessionID");
 			  }
 			  
-			  AuthenticatedSessionStore dbsession = (AuthenticatedSessionStore) result.get(0);
-						
-				//delete MOA Session
-				session.delete(dbsession);
-				session.getTransaction().commit();
+			 AuthenticatedSessionStore dbsession = (AuthenticatedSessionStore) result.get(0);
+			 
+			 session.getTransaction().commit();
+			  
+			 cleanDelete(dbsession);			
 		  }
 				
 	}
@@ -443,7 +443,7 @@ public class AuthenticationSessionStoreage {
 			 return false;
 					 
 		  } else {
-			  MOASessionDBUtils.delete(result.get(0));
+			  cleanDelete(result.get(0));
 			  return true;
 		  }
 		
@@ -521,7 +521,7 @@ public class AuthenticationSessionStoreage {
 		if (results.size() != 0) {
 			for(AuthenticatedSessionStore result : results) {
 				try { 
-					MOASessionDBUtils.delete(result);
+					cleanDelete(result);
 					Logger.info("Authenticated session with sessionID=" + result.getSessionid() 
 							+ " after session timeout.");
 				
@@ -534,6 +534,24 @@ public class AuthenticationSessionStoreage {
 		}	
 	}
 	
+	private static void cleanDelete(AuthenticatedSessionStore result) {		
+		try {
+			result.setSession(new byte[] {});
+			MOASessionDBUtils.saveOrUpdate(result);
+			
+		} catch (MOADatabaseException e) {
+			Logger.warn("Blank authenticated session with sessionID=" + result.getSessionid() + " FAILED.", e);
+			
+		} finally {
+			if (!MOASessionDBUtils.delete(result))
+				Logger.error("Authenticated session with sessionID=" + result.getSessionid() 
+							+ " not removed! (Error during Database communication)");
+			
+		}
+		
+		
+	}
+	
 	@SuppressWarnings("rawtypes")
 	private static AuthenticatedSessionStore searchInDatabase(String sessionID) throws MOADatabaseException {
 		  MiscUtil.assertNotNull(sessionID, "moasessionID");