X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fsaml2%2Fmetadata%2Fimpl%2FXMLMetadataProvider.cpp;h=ffa441193f14f0972798ca9a0ad6626e7ee1c181;hb=46ac496b77b850309c07e732ff89fa41c776915d;hp=6a8ef4f847d2fccc70b499cdf993e0d532b04c12;hpb=932cfaae2176c2eba1a9938dc420591a9551a7f3;p=shibboleth%2Fcpp-opensaml.git diff --git a/saml/saml2/metadata/impl/XMLMetadataProvider.cpp b/saml/saml2/metadata/impl/XMLMetadataProvider.cpp index 6a8ef4f..ffa4411 100644 --- a/saml/saml2/metadata/impl/XMLMetadataProvider.cpp +++ b/saml/saml2/metadata/impl/XMLMetadataProvider.cpp @@ -22,9 +22,9 @@ #include "internal.h" #include "saml2/metadata/Metadata.h" +#include "saml2/metadata/MetadataFilter.h" #include "saml2/metadata/AbstractMetadataProvider.h" -#include #include #include @@ -44,7 +44,10 @@ namespace opensaml { class SAML_DLLLOCAL XMLMetadataProvider : public AbstractMetadataProvider, public ReloadableXMLFile { public: - XMLMetadataProvider(const DOMElement* e) : AbstractMetadataProvider(e), ReloadableXMLFile(e), m_object(NULL) {} + XMLMetadataProvider(const DOMElement* e) + : AbstractMetadataProvider(e), ReloadableXMLFile(e, Category::getInstance(SAML_LOGCAT".MetadataProvider")), + m_object(NULL) { + } virtual ~XMLMetadataProvider() { delete m_object; } @@ -60,12 +63,8 @@ namespace opensaml { protected: pair load(); - bool isValid() const { - const TimeBoundSAMLObject* bound=dynamic_cast(m_object); - return bound ? bound->isValid() : false; - } - private: + using AbstractMetadataProvider::index; void index(); XMLObject* m_object;