1 files changed, 16 insertions, 2 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/metadata/MOAMetadataProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/metadata/MOAMetadataProvider.java
index 19adfe4c4..dc024e695 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/metadata/MOAMetadataProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/metadata/MOAMetadataProvider.java
@@ -31,6 +31,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Timer;
 
 import javax.xml.namespace.QName;
 
@@ -68,6 +69,7 @@ public class MOAMetadataProvider extends SimpleMOAMetadataProvider
 	
 //	private static MOAMetadataProvider instance = null;
 	MetadataProvider internalProvider = null;
+	private Timer timer = null;
 	private static Object mutex = new Object();
 	//private Map<String, Date> lastAccess = null;
 	
@@ -163,10 +165,14 @@ public class MOAMetadataProvider extends SimpleMOAMetadataProvider
 						byte[] cert = Base64Utils.decode(certBase64, false);
 						String oaFriendlyName = oaParam.getFriendlyName();
 					
+						if (timer == null)
+							timer = new Timer(true);
+						
 						ChainingMetadataProvider chainProvider = (ChainingMetadataProvider) internalProvider;						
 						HTTPMetadataProvider newMetadataProvider = createNewHTTPMetaDataProvider(metadataURL, 								 
 								buildMetadataFilterChain(oaParam, metadataURL, cert), 
-								oaFriendlyName);
+								oaFriendlyName,
+								timer);
 						
 						chainProvider.addMetadataProvider(newMetadataProvider);
 						
@@ -374,6 +380,10 @@ public class MOAMetadataProvider extends SimpleMOAMetadataProvider
 			}
 				
 			internalProvider = new ChainingMetadataProvider();
+			
+			if (timer != null)
+				timer.cancel();
+			
 		} else {
 			Logger.warn("ReInitalize MOAMetaDataProvider is not possible! MOA-ID Instance has to be restarted manualy");
 		}
@@ -414,12 +424,16 @@ public class MOAMetadataProvider extends SimpleMOAMetadataProvider
 								byte[] cert = Base64Utils.decode(certBase64, false);
 								
 								
+								if (timer == null)
+									timer = new Timer(true);
+								
 								Logger.info("Loading metadata for: " + oaFriendlyName);					
 								if (!providersinuse.containsKey(metadataurl)) {					
 									httpProvider = createNewHTTPMetaDataProvider(
 											metadataurl, 
 											buildMetadataFilterChain(oaParam, metadataurl, cert),
-											oaFriendlyName);
+											oaFriendlyName,
+											timer);
 						
 									if (httpProvider != null)
 										providersinuse.put(metadataurl, httpProvider);