1 files changed, 7 insertions, 3 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
index a4ca3e403..31c29aef0 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
@@ -132,7 +132,7 @@ public class EditGeneralConfigAction extends BasicAction {
 	public String saveConfig() {
 		try {
 			populateBasicInformations();
-			
+						
 		} catch (BasicActionException e) {
 			return Constants.STRUTS_ERROR;
 			
@@ -210,6 +210,8 @@ public class EditGeneralConfigAction extends BasicAction {
 	public String back() {
 		try {
 			populateBasicInformations();
+			ConfigurationDBUtils.closeSession();
+			
 			
 		} catch (BasicActionException e) {
 			return Constants.STRUTS_ERROR;
@@ -654,9 +656,11 @@ public class EditGeneralConfigAction extends BasicAction {
 		} catch (MOADatabaseException e) {
 			log.warn("MOAID Configuration can not be stored in Database", e);
 			return LanguageHelper.getErrorString("error.db.oa.store", request);
+			
+		} finally {
+			ConfigurationDBUtils.closeSession();
+			
 		}
-
-		ConfigurationDBUtils.closeSession();
 		
 		return null;
 	}