From 47847f1c0569480b5dbd10ae69227460e093d697 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Fri, 7 Jan 2011 20:30:40 +0000 Subject: [PATCH] https://issues.shibboleth.net/jira/browse/CPPOST-60 --- saml/saml2/metadata/impl/XMLMetadataProvider.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/saml/saml2/metadata/impl/XMLMetadataProvider.cpp b/saml/saml2/metadata/impl/XMLMetadataProvider.cpp index 57bb4cf..ff9b262 100644 --- a/saml/saml2/metadata/impl/XMLMetadataProvider.cpp +++ b/saml/saml2/metadata/impl/XMLMetadataProvider.cpp @@ -152,8 +152,10 @@ XMLMetadataProvider::XMLMetadataProvider(const DOMElement* e) pair XMLMetadataProvider::load(bool backup) { - // Lower the refresh rate in case of an error. - m_reloadInterval = m_minRefreshDelay; + if (!backup) { + // Lower the refresh rate in case of an error. + m_reloadInterval = m_minRefreshDelay; + } // Call the base class to load/parse the appropriate XML resource. pair raw = ReloadableXMLFile::load(backup); @@ -234,8 +236,8 @@ pair XMLMetadataProvider::load(bool backup) // Tracking cacheUntil through the tree is TBD, but // validUntil is the tightest interval amongst the children. - // If a remote resource, adjust the reload interval. - if (!backup && !m_local) { + // If a remote resource that's monitored, adjust the reload interval. + if (!backup && !m_local && m_lock) { m_backoffFactor = 1; m_reloadInterval = computeNextRefresh(); m_log.info("adjusted reload interval to %d seconds", m_reloadInterval); -- 2.1.4