use old ConfigTool

1 files changed, 3 insertions, 9 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/utils/UserRequestCleaner.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/utils/UserRequestCleaner.java
index 62e01720d..5f55a61d5 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/utils/UserRequestCleaner.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/utils/UserRequestCleaner.java
@@ -28,8 +28,6 @@ import java.util.List;
 
 import org.apache.log4j.Logger;
 
-import at.gv.egovernment.moa.id.commons.db.ConfigurationDBRead;
-import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils;
 import at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase;
 import at.gv.egovernment.moa.id.config.webgui.exception.ConfigurationException;
 import at.gv.egovernment.moa.id.configuration.auth.AuthenticationManager;
@@ -49,7 +47,7 @@ public class UserRequestCleaner implements Runnable {
 				ConfigurationProvider config = ConfigurationProvider.getInstance();
 				
 				//clean up user request storage
-				List<UserDatabase> userrequests = ConfigurationDBRead.getAllOpenUsersRequests();
+				List<UserDatabase> userrequests = config.getUserManagement().getAllOpenUsersRequests();
 				if (userrequests != null) {
 					Calendar cal = Calendar.getInstance();
 					cal.add(Calendar.HOUR, config.getUserRequestCleanUpDelay()*-1);
@@ -60,7 +58,7 @@ public class UserRequestCleaner implements Runnable {
 
 						if (requestdate != null && requestdate.after(cleanupdate)) {
 							log.info("Remove UserRequest from Database");
-							ConfigurationDBUtils.delete(dbuser);
+							config.getUserManagement().delete(dbuser);
 						}
 					
 					}					
@@ -68,7 +66,6 @@ public class UserRequestCleaner implements Runnable {
 				
 				//clean up active user storage
 				AuthenticationManager.getInstance().removeAllUsersAfterTimeOut();
-				ConfigurationDBUtils.closeSession();
 								
 				Thread.sleep(SESSION_CLEANUP_INTERVAL * 1000);
 				
@@ -77,10 +74,7 @@ public class UserRequestCleaner implements Runnable {
 				
 			} catch (InterruptedException e) {
 				
-			} finally {
-				ConfigurationDBUtils.closeSession();
-				
-			}
+			} 
 		 }
 	}