X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fopensaml2.git;a=blobdiff_plain;f=saml%2Fsaml2%2Fmetadata%2Fimpl%2FAbstractMetadataProvider.cpp;h=6508e58a7410b9f98b8be6e3c01c880e86081d04;hp=196962b1893b8343244dab9866f7ef450361ae5d;hb=c089f03a9b08dc947a815be624654ca401c6b369;hpb=db0369e629fe50a0f5e0d1824ab55bfbab346102

diff --git a/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp b/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
index 196962b..6508e58 100644
--- a/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
@@ -69,13 +69,26 @@ void AbstractMetadataProvider::emitChangeEvent() const
     ObservableMetadataProvider::emitChangeEvent();
 }
 
-void AbstractMetadataProvider::index(EntityDescriptor* site, time_t validUntil)
+void AbstractMetadataProvider::index(EntityDescriptor* site, time_t validUntil, bool replace) const
 {
     if (validUntil < site->getValidUntilEpoch())
         site->setValidUntil(validUntil);
 
     auto_ptr_char id(site->getEntityID());
     if (id.get()) {
+        if (replace) {
+            m_sites.erase(id.get());
+            for (sitemap_t::iterator s = m_sources.begin(); s != m_sources.end();) {
+                if (s->second == site) {
+                    sitemap_t::iterator temp = s;
+                    ++s;
+                    m_sources.erase(temp);
+                }
+                else {
+                    ++s;
+                }
+            }
+        }
         m_sites.insert(sitemap_t::value_type(id.get(),site));
     }
     
@@ -120,7 +133,7 @@ void AbstractMetadataProvider::index(EntityDescriptor* site, time_t validUntil)
     }
 }
 
-void AbstractMetadataProvider::index(EntitiesDescriptor* group, time_t validUntil)
+void AbstractMetadataProvider::index(EntitiesDescriptor* group, time_t validUntil) const
 {
     if (validUntil < group->getValidUntilEpoch())
         group->setValidUntil(validUntil);
@@ -139,11 +152,13 @@ void AbstractMetadataProvider::index(EntitiesDescriptor* group, time_t validUnti
         index(*j,group->getValidUntilEpoch());
 }
 
-void AbstractMetadataProvider::clearDescriptorIndex()
+void AbstractMetadataProvider::clearDescriptorIndex(bool freeSites)
 {
-    m_sources.clear();
+    if (freeSites)
+        for_each(m_sites.begin(), m_sites.end(), cleanup_const_pair<string,EntityDescriptor>());
     m_sites.clear();
     m_groups.clear();
+    m_sources.clear();
 }
 
 const EntitiesDescriptor* AbstractMetadataProvider::getEntitiesDescriptor(const char* name, bool strict) const