solve problems with multithreading and hibernate session

2 files changed, 36 insertions, 6 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralStorkConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralStorkConfig.java
index 5e177655d..975f627d4 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralStorkConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralStorkConfig.java
@@ -26,6 +26,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 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.AuthComponentGeneral;
 import at.gv.egovernment.moa.id.commons.db.dao.config.CPEPS;
 import at.gv.egovernment.moa.id.commons.db.dao.config.ForeignIdentities;
@@ -42,6 +43,22 @@ public class GeneralStorkConfig {
 	private int qaa;
     private static final Logger log = Logger.getLogger(GeneralStorkConfig.class);
 
+    private MOAIDConfiguration dbconfig = null;
+    
+    /**
+	 * 
+	 */
+	public GeneralStorkConfig() {
+		dbconfig = ConfigurationDBRead.getMOAIDConfiguration();
+		
+	}
+    
+	@Override
+    protected void finalize() throws Throwable {
+		ConfigurationDBUtils.closeSession();
+        super.finalize();        
+    }
+		
     public void parse(MOAIDConfiguration config) {
         log.info("Initializing general Stork config");
 
@@ -93,7 +110,7 @@ public class GeneralStorkConfig {
 		if (null == cpepslist)
 			return null;
 
-		MOAIDConfiguration dbconfig = ConfigurationDBRead.getMOAIDConfiguration();
+		//MOAIDConfiguration dbconfig = ConfigurationDBRead.getMOAIDConfiguration();
 		
 		try {
 			List<CPEPS> cpepss = dbconfig.getAuthComponentGeneral().getForeignIdentities().getSTORK().getCPEPS();
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
index 45875010b..e0a312c09 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
@@ -30,9 +30,11 @@ import javax.servlet.http.HttpServletRequest;
 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.AttributeProviderPlugin;
 import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentOA;
 import at.gv.egovernment.moa.id.commons.db.dao.config.CPEPS;
+import at.gv.egovernment.moa.id.commons.db.dao.config.MOAIDConfiguration;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OASTORK;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OAStorkAttribute;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
@@ -59,11 +61,16 @@ public class OASTORKConfig implements IOnlineApplicationData{
 	private List<String> citizenCountries;
 	private List<String> enabledCitizenCountries;
 	
+	private MOAIDConfiguration dbconfig = null;
+	
 	public OASTORKConfig() {
 		// fetch available citizen countries
 		citizenCountries = new ArrayList<String>();
+		
+		dbconfig = ConfigurationDBRead.getMOAIDConfiguration();
+		
 		try {
-			for(CPEPS current : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getCPEPS()) {
+			for(CPEPS current : dbconfig.getAuthComponentGeneral().getForeignIdentities().getSTORK().getCPEPS()) {
 				citizenCountries.add(current.getCountryCode());
 			}
 			
@@ -73,6 +80,12 @@ public class OASTORKConfig implements IOnlineApplicationData{
 		
 	}
 
+	@Override
+    protected void finalize() throws Throwable {
+		ConfigurationDBUtils.closeSession();
+        super.finalize();        
+    }
+	
 	/* (non-Javadoc)
 	 * @see at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#getName()
 	 */
@@ -98,7 +111,7 @@ public class OASTORKConfig implements IOnlineApplicationData{
 					setQaa(config.getQaa());
 				} catch(NullPointerException e) {
 					// if there is no configuration available for the OA, get the default qaa level
-					setQaa(ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getQualityAuthenticationAssuranceLevel());
+					setQaa(dbconfig.getAuthComponentGeneral().getForeignIdentities().getSTORK().getQualityAuthenticationAssuranceLevel());
 				}
 				
 
@@ -110,7 +123,7 @@ public class OASTORKConfig implements IOnlineApplicationData{
 				attributes = new ArrayList<AttributeHelper>();
                 try {
                 	try {
-                		for(StorkAttribute current : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getAttributes()) {
+                		for(StorkAttribute current : dbconfig.getAuthComponentGeneral().getForeignIdentities().getSTORK().getAttributes()) {
                 			AttributeHelper tmp = null;
 
                 			for(OAStorkAttribute sepp : config.getOAAttributes())
@@ -220,7 +233,7 @@ public class OASTORKConfig implements IOnlineApplicationData{
 			return result;
 
 		for(AttributeHelper current : getHelperAttributes()) {
-			for(StorkAttribute currentAttribute : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getAttributes())
+			for(StorkAttribute currentAttribute : dbconfig.getAuthComponentGeneral().getForeignIdentities().getSTORK().getAttributes())
 				if(currentAttribute.getName().equals(current.getName())) {
 					if(current.isUsed() || currentAttribute.isMandatory()) {
 						OAStorkAttribute tmp = new OAStorkAttribute();
@@ -260,7 +273,7 @@ public class OASTORKConfig implements IOnlineApplicationData{
 			List<CPEPS> result = new ArrayList<CPEPS>();
 			
 			try {
-				for(CPEPS current : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getCPEPS()) {
+				for(CPEPS current : dbconfig.getAuthComponentGeneral().getForeignIdentities().getSTORK().getCPEPS()) {
 					if(enabledCitizenCountries.contains(current.getCountryCode()))
 						result.add(current);
 				}