[cpp-sp] branch master updated: Update with metadata API changes.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=c6eb4e71e2b7488803daa1ed841d3cbe442e18a9

The following commit(s) were added to refs/heads/master by this push:
       new  c6eb4e7   Update with metadata API changes.
c6eb4e7 is described below

commit c6eb4e71e2b7488803daa1ed841d3cbe442e18a9
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu May 17 19:15:46 2018 -0400

    Update with metadata API changes.
---
 shibsp/metadata/DynamicMetadataProvider.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/shibsp/metadata/DynamicMetadataProvider.cpp b/shibsp/metadata/DynamicMetadataProvider.cpp
index 75e3ea2..f45bb2e 100644
--- a/shibsp/metadata/DynamicMetadataProvider.cpp
+++ b/shibsp/metadata/DynamicMetadataProvider.cpp
@@ -80,12 +80,11 @@ namespace shibsp {
 
         virtual void indexEntity(EntityDescriptor* site, time_t& validUntil, bool replace=false) const;
 
-        virtual void unindex(const XMLCh* entityID, bool freeSites=false) const;
-
         void init();
 
     protected:
-        EntityDescriptor* resolve(const MetadataProvider::Criteria& criteria) const;
+        virtual EntityDescriptor* resolve(const MetadataProvider::Criteria& criteria, string& cacheTag) const;
+        virtual void unindex(const XMLCh* entityID, bool freeSites=false) const;
 
     private:
         Category& m_log;
@@ -216,7 +215,7 @@ void DynamicMetadataProvider::init()
 }
 
 
-EntityDescriptor* DynamicMetadataProvider::resolve(const MetadataProvider::Criteria& criteria) const
+EntityDescriptor* DynamicMetadataProvider::resolve(const MetadataProvider::Criteria& criteria, string& cacheTag) const
 {
 #ifdef _DEBUG
     xmltooling::NDC("resolve");
@@ -464,7 +463,7 @@ void DynamicMetadataProvider::FolderCallback(const char* pathname, struct stat&
             if (entity.get()) {
                 const BatchLoadMetadataFilterContext bc(true);
                 me->doFilters(&bc, *entity);
-                me->cacheEntity(entity.get());
+                me->cacheEntity(entity.get(), "");
                 entity.release();
             }
         }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.