1 files changed, 13 insertions, 14 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/LoginFormBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/LoginFormBuilder.java
index 3282036b4..789651f16 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/LoginFormBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/LoginFormBuilder.java
@@ -3,15 +3,13 @@ package at.gv.egovernment.moa.id.auth.builder;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringWriter;
 import java.net.URI;
 
 import org.apache.commons.io.IOUtils;
 
-import at.gv.egovernment.moa.id.auth.servlet.GenerateIFrameTemplateServlet;
-import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
-import at.gv.egovernment.moa.id.config.OAParameter;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
 import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
 import at.gv.egovernment.moa.id.protocols.saml1.SAML1Protocol;
@@ -42,22 +40,17 @@ public class LoginFormBuilder {
 	private static String MANDATEVISIBLE = "#MANDATEVISIBLE#";
 	private static String MANDATECHECKED = "#MANDATECHECKED#";
 
-	
-	
 	private static String SERVLET = CONTEXTPATH+"/GenerateIframeTemplate";
 	
 	private static String getTemplate() {
 
 			String template = null; 
-		
+			InputStream input = null; 
+			
 			try {
 				String pathLocation;
-				
-				InputStream input;
-				
-				String rootconfigdir = AuthConfigurationProvider.getInstance().getRootConfigFileDir();
-			
 
+				String rootconfigdir = AuthConfigurationProvider.getInstance().getRootConfigFileDir();
 				pathLocation = rootconfigdir + HTMLTEMPLATESDIR + HTMLTEMPLATEFULL;
 				
 				try {
@@ -83,11 +76,17 @@ public class LoginFormBuilder {
 				template = template.replace(BKU_ONLINE, OAAuthParameter.ONLINEBKU);
 				template = template.replace(BKU_HANDY, OAAuthParameter.HANDYBKU);
 				template = template.replace(BKU_LOCAL, OAAuthParameter.LOCALBKU);
-				
-				input.close();
-				
+								
 			} catch (Exception e) {
 				Logger.error("Failed to read template", e);
+				
+			} finally {
+				try {
+					input.close();
+					
+				} catch (IOException e) {
+					Logger.warn("SendAssertionTemplate inputstream can not be closed.", e);
+				}
 			}
 			return template;
 	}