1 files changed, 12 insertions, 8 deletions
diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/engine/MOAeIDASChainingMetadataProvider.java b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/engine/MOAeIDASChainingMetadataProvider.java
index 7fb0dbb5f..cb1fe36c8 100644
--- a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/engine/MOAeIDASChainingMetadataProvider.java
+++ b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/engine/MOAeIDASChainingMetadataProvider.java
@@ -210,7 +210,8 @@ public class MOAeIDASChainingMetadataProvider implements ObservableMetadataProvi
 							authConfig.getTrustedCACertificates(),
 							null,
 							AuthConfiguration.DEFAULT_X509_CHAININGMODE, 
-							authConfig.isTrustmanagerrevoationchecking());
+							authConfig.isTrustmanagerrevoationchecking(),
+							authConfig.getRevocationMethodOrder());
 					
 					httpClient.setCustomSSLTrustStore(metadataURL, protoSocketFactory);
 
@@ -306,14 +307,17 @@ public class MOAeIDASChainingMetadataProvider implements ObservableMetadataProvi
 				} else {
 					//load new Metadata Provider				
 					ChainingMetadataProvider chainProvider = (ChainingMetadataProvider) internalProvider;						
-					HTTPMetadataProvider newMetadataProvider = createNewHTTPMetaDataProvider(metadataURL);										
-					chainProvider.addMetadataProvider(newMetadataProvider);
+					HTTPMetadataProvider newMetadataProvider = createNewHTTPMetaDataProvider(metadataURL);	
 					
-					emitChangeEvent();
-					Logger.info("eIDAS metadata for " 
-							+ metadataURL + " is added.");
-					return true;
-										
+					if (newMetadataProvider != null) {
+						chainProvider.addMetadataProvider(newMetadataProvider);
+					
+						emitChangeEvent();
+						Logger.info("eIDAS metadata for " 
+								+ metadataURL + " is added.");
+						return true;
+						
+					}										
 				}
 														
 			} else