change initialization step in AuthenticationFilter

1 files changed, 5 insertions, 10 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 e176e5141..bea6220ff 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
@@ -85,19 +85,14 @@ public class ConfigurationProvider {
 	public static ConfigurationProvider getInstance() throws ConfigurationException {
 
 		if (instance == null) {
-			synchronized (ConfigurationProvider.class) {
-				instance =  new ConfigurationProvider();
-			}
+			instance =  new ConfigurationProvider();
+			instance.inizialize();
 
 		}
 		
 		return instance;
 	}
-	
-	private ConfigurationProvider() throws ConfigurationException {
-		inizialize();
-	}
-	
+		
 	private void inizialize() throws ConfigurationException {
 		
 		configFileName = System.getProperty(SYSTEM_PROP_CONFIG);
@@ -143,10 +138,10 @@ public class ConfigurationProvider {
 			
 							
 		} catch (FileNotFoundException e) {
-			throw new ConfigurationException("config.01", e);
+			throw new ConfigurationException("config.01", new Object[]{configFileName},  e);
 			
 		} catch (IOException e) {
-			throw new ConfigurationException("config.02", e);
+			throw new ConfigurationException("config.02", new Object[]{configFileName}, e);
 			
 		} catch (MOADatabaseException e) {
 			throw new ConfigurationException("config.03", e);