1 files changed, 10 insertions, 1 deletions
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPMetadataProvider.java b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPMetadataProvider.java
index 57f6e373..475b8407 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPMetadataProvider.java
+++ b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPMetadataProvider.java
@@ -38,7 +38,16 @@ public class PVPMetadataProvider extends AbstractChainingMetadataProvider{
 	protected String getMetadataURL(String entityId) throws EAAFConfigurationException {
 		ISPConfiguration spConfig = basicConfig.getServiceProviderConfiguration(entityId);
 		if (spConfig != null) {
-			return spConfig.getConfigurationValue(MSeIDASNodeConstants.PROP_CONFIG_SP_PVP2_METADATA_URL);
+			String metadataURL = entityId;
+			
+			String metadataURLFromConfig = spConfig.getConfigurationValue(MSeIDASNodeConstants.PROP_CONFIG_SP_PVP2_METADATA_URL);
+			if (StringUtils.isNotEmpty(metadataURLFromConfig)) {
+				log.debug("Use metdataURL from configuration for EntityId: " + entityId);
+				metadataURL = metadataURLFromConfig;
+				
+			}
+				
+			return metadataURL;
 			
 		} else
 			log.info("No ServiceProvider with entityId: " + entityId + " in configuration.");