From: Scott Cantor Date: Tue, 26 Oct 2010 18:37:14 +0000 (+0000) Subject: Ensure MetadataProvider c'tor is called. X-Git-Tag: 2.4RC1~5 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=commitdiff_plain;h=957a15ca26870e578bfe58016ef8b2ebf1c77669 Ensure MetadataProvider c'tor is called. --- diff --git a/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp b/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp index 634caf6..fafce23 100644 --- a/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp +++ b/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp @@ -34,7 +34,7 @@ using namespace opensaml::saml2md; using namespace xmltooling; using namespace std; -DiscoverableMetadataProvider::DiscoverableMetadataProvider(const DOMElement* e) : m_legacyOrgNames(false) +DiscoverableMetadataProvider::DiscoverableMetadataProvider(const DOMElement* e) : MetadataProvider(e), m_legacyOrgNames(false) { static const XMLCh legacyOrgNames[] = UNICODE_LITERAL_14(l,e,g,a,c,y,O,r,g,N,a,m,e,s); m_legacyOrgNames = XMLHelper::getAttrBool(e, false, legacyOrgNames); diff --git a/saml/saml2/metadata/impl/XMLMetadataProvider.cpp b/saml/saml2/metadata/impl/XMLMetadataProvider.cpp index 2f410bd..230ebd1 100644 --- a/saml/saml2/metadata/impl/XMLMetadataProvider.cpp +++ b/saml/saml2/metadata/impl/XMLMetadataProvider.cpp @@ -107,7 +107,8 @@ namespace opensaml { #endif XMLMetadataProvider::XMLMetadataProvider(const DOMElement* e) - : AbstractMetadataProvider(e), DiscoverableMetadataProvider(e), ReloadableXMLFile(e, Category::getInstance(SAML_LOGCAT".MetadataProvider.XML"), false), + : MetadataProvider(e), AbstractMetadataProvider(e), DiscoverableMetadataProvider(e), + ReloadableXMLFile(e, Category::getInstance(SAML_LOGCAT".MetadataProvider.XML"), false), m_object(nullptr), m_discoveryFeed(XMLHelper::getAttrBool(e, true, discoveryFeed)), m_refreshDelayFactor(0.75), m_backoffFactor(1), m_minRefreshDelay(XMLHelper::getAttrInt(e, 600, minRefreshDelay)),