1 files changed, 15 insertions, 3 deletions
diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/config/MOAeIDASSAMLInstanceConfigurationImpl.java b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/config/MOAeIDASSAMLInstanceConfigurationImpl.java
index 2d76be206..384d6be0b 100644
--- a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/config/MOAeIDASSAMLInstanceConfigurationImpl.java
+++ b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/config/MOAeIDASSAMLInstanceConfigurationImpl.java
@@ -22,7 +22,8 @@
  */
 package at.gv.egovernment.moa.id.auth.modules.eidas.config;
 
-import java.net.MalformedURLException;
+import java.io.File;
+import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -35,6 +36,7 @@ import java.util.Properties;
 
 import at.gv.egovernment.moa.id.commons.api.exceptions.ConfigurationException;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProviderFactory;
+import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.FileUtils;
 import eu.eidas.samlengineconfig.ConfigurationParameter;
 import eu.eidas.samlengineconfig.InstanceConfiguration;
@@ -85,9 +87,19 @@ public class MOAeIDASSAMLInstanceConfigurationImpl extends
 							AuthConfigurationProviderFactory.getInstance().getRootConfigFileDir());
 					
 					URI uri = new URL(absoluteConfigFile).toURI();
-					param.setValue(uri.getRawPath().substring(1));
 					
-				} catch (ConfigurationException | MalformedURLException | URISyntaxException e) {
+					File file = new File(uri);
+					if (file.exists())
+						param.setValue(file.getCanonicalPath());
+					
+					else {
+						Logger.error("eIDAS-configuration fileparameter with key:" + param.getName() + " and path:" + uri.toString() + " NOT exist!");
+						param.setValue(null);
+						
+					}
+					
+					
+				} catch (ConfigurationException | URISyntaxException | IOException e) {
 					//TODO: make final!!!!
 					e.printStackTrace();
 					param.setValue(next.getValue());