merging

1 files changed, 12 insertions, 5 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
index f5121aaf2..28dfefb91 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
@@ -91,6 +91,8 @@ public class ConfigurationProvider {
 			fis = new FileInputStream(propertiesFile);
 			props.load(fis);
 			
+			fis.close();
+			
 			// initialize hibernate
 			synchronized (ConfigurationProvider.class) {
 				
@@ -206,11 +208,8 @@ public class ConfigurationProvider {
 	}
 	
 	public boolean isPVP2LoginActive() {
-		if (!pvp2logininitialzied)
-			return false;
-		
-		String result = props.getProperty("general.login.pvp2.isactive", "false");
-		return Boolean.parseBoolean(result);
+					
+		return Boolean.parseBoolean(props.getProperty("general.login.pvp2.isactive", "false"));
 	}
 	
 	public boolean isPVP2LoginBusinessService() {
@@ -258,6 +257,14 @@ public class ConfigurationProvider {
 		return props.getProperty("general.login.pvp2.keystore.authrequest.key.password");
 	}
 	
+	public String getPVP2KeystoreAuthRequestEncryptionKeyAlias() {
+		return props.getProperty("general.login.pvp2.keystore.authrequest.encryption.key.alias");
+	}
+	
+	public String getPVP2KeystoreAuthRequestEncryptionKeyPassword() {
+		return props.getProperty("general.login.pvp2.keystore.authrequest.encryption.key.password");
+	}
+	
 	public String getPVP2IDPMetadataURL() {
 		return props.getProperty("general.login.pvp2.idp.metadata.url");
 	}