1 files changed, 51 insertions, 39 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/InterfederationIDPAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/InterfederationIDPAction.java
index d2d318413..89dce3200 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/InterfederationIDPAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/InterfederationIDPAction.java
@@ -91,9 +91,7 @@ public class InterfederationIDPAction extends BasicOAAction {
 				
 				session.setAttribute(Constants.SESSION_RETURNAREA, 
 						Constants.STRUTS_RETURNAREA_VALUES.main.name());
-				
-				ConfigurationDBUtils.closeSession();
-				
+								
 				return Constants.STRUTS_SUCCESS;
 				
 			} else {
@@ -105,6 +103,9 @@ public class InterfederationIDPAction extends BasicOAAction {
 		} catch (BasicActionException e) {
 			return Constants.STRUTS_ERROR;
 			
+		} finally {
+			ConfigurationDBUtils.closeSession();
+			
 		}
 	}
 	
@@ -145,6 +146,9 @@ public class InterfederationIDPAction extends BasicOAAction {
 		} catch (BasicActionException e) {
 			return Constants.STRUTS_ERROR;
 			
+		} finally {
+			ConfigurationDBUtils.closeSession();
+			
 		}
         
         return Constants.STRUTS_OA_EDIT + interfederationType;
@@ -199,7 +203,10 @@ public class InterfederationIDPAction extends BasicOAAction {
 			addActionError(e.getStrutsError());
 			return e.getStrutsReturnValue();
 			
-		}		
+		} finally {
+			ConfigurationDBUtils.closeSession();
+			
+		}
 	}
 	
 	public String saveIDP() {
@@ -297,7 +304,10 @@ public class InterfederationIDPAction extends BasicOAAction {
 			addActionError(e.getStrutsError());
 			return e.getStrutsReturnValue();
 			
-		}		
+		} finally {
+			ConfigurationDBUtils.closeSession();
+			
+		}
 	}
 	
 	public String cancleAndBackIDP() {
@@ -310,16 +320,19 @@ public class InterfederationIDPAction extends BasicOAAction {
 				return Constants.STRUTS_NOTALLOWED;
 			}
 			
+	        session.setAttribute(Constants.SESSION_OAID, null);
+	        addActionMessage(LanguageHelper.getGUIString("webpages.idp.cancle", getGeneralOA().getIdentifier(), request));
+	        ConfigurationDBUtils.closeSession();
+	
+	        return Constants.STRUTS_SUCCESS;
+        
 		} catch (BasicActionException e) {
 			return Constants.STRUTS_ERROR;
 			
+		} finally {
+			ConfigurationDBUtils.closeSession();
+			
 		}
-
-        session.setAttribute(Constants.SESSION_OAID, null);
-        addActionMessage(LanguageHelper.getGUIString("webpages.idp.cancle", getGeneralOA().getIdentifier(), request));
-        ConfigurationDBUtils.closeSession();
-
-        return Constants.STRUTS_SUCCESS;		
 	}
 	
 	public String deleteIDP() {
@@ -335,7 +348,30 @@ public class InterfederationIDPAction extends BasicOAAction {
 			
 			oaidentifier  = preProcessDeleteOnlineApplication();
 	        
-			
+			session.setAttribute(Constants.SESSION_OAID, null);
+	        OnlineApplication onlineapplication = ConfigurationDBRead.getOnlineApplication(oaidentifier);
+	        
+	        try {
+	            if (onlineapplication.getAuthComponentOA().getOAPVP2() != null &&
+	            		MiscUtil.isNotEmpty(onlineapplication.getAuthComponentOA().getOAPVP2().getMetadataURL())) {
+	                MOAIDConfiguration moaconfig = ConfigurationDBRead.getMOAIDConfiguration();
+	                moaconfig.setPvp2RefreshItem(new Date());
+	                ConfigurationDBUtils.saveOrUpdate(moaconfig);
+	
+	            }
+	        } catch (Throwable e) {
+	            log.info("Found no MetadataURL in OA-Databaseconfig!", e);
+	        }
+	
+	        if (ConfigurationDBUtils.delete(onlineapplication)) {
+	            addActionMessage(LanguageHelper.getGUIString("webpages.oaconfig.delete.message", oaidentifier, request));
+	            return Constants.STRUTS_SUCCESS;
+	
+	        } else {
+	            addActionError(LanguageHelper.getGUIString("webpages.oaconfig.delete.error", oaidentifier, request));
+	            return Constants.STRUTS_SUCCESS;
+	        }
+        
 		} catch (BasicActionException e) {
 			return Constants.STRUTS_ERROR;
 			
@@ -343,34 +379,10 @@ public class InterfederationIDPAction extends BasicOAAction {
 			addActionError(e.getStrutsError());
 			return e.getStrutsReturnValue();
 			
+		} finally {
+			ConfigurationDBUtils.closeSession();
+			
 		}
-
-		session.setAttribute(Constants.SESSION_OAID, null);
-        OnlineApplication onlineapplication = ConfigurationDBRead.getOnlineApplication(oaidentifier);
-        
-        try {
-            if (onlineapplication.getAuthComponentOA().getOAPVP2() != null &&
-            		MiscUtil.isNotEmpty(onlineapplication.getAuthComponentOA().getOAPVP2().getMetadataURL())) {
-                MOAIDConfiguration moaconfig = ConfigurationDBRead.getMOAIDConfiguration();
-                moaconfig.setPvp2RefreshItem(new Date());
-                ConfigurationDBUtils.saveOrUpdate(moaconfig);
-
-            }
-        } catch (Throwable e) {
-            log.info("Found no MetadataURL in OA-Databaseconfig!", e);
-        }
-
-        if (ConfigurationDBUtils.delete(onlineapplication)) {
-        	
-            ConfigurationDBUtils.closeSession();
-            addActionMessage(LanguageHelper.getGUIString("webpages.oaconfig.delete.message", oaidentifier, request));
-            return Constants.STRUTS_SUCCESS;
-
-        } else {
-            ConfigurationDBUtils.closeSession();
-            addActionError(LanguageHelper.getGUIString("webpages.oaconfig.delete.error", oaidentifier, request));
-            return Constants.STRUTS_SUCCESS;
-        }
 		
 	}