projects
/
shibboleth
/
cpp-opensaml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
48c800a
)
https://issues.shibboleth.net/jira/browse/CPPOST-60
author
Scott Cantor
<cantor.2@osu.edu>
Fri, 7 Jan 2011 20:30:40 +0000
(20:30 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Fri, 7 Jan 2011 20:30:40 +0000
(20:30 +0000)
saml/saml2/metadata/impl/XMLMetadataProvider.cpp
patch
|
blob
|
history
diff --git
a/saml/saml2/metadata/impl/XMLMetadataProvider.cpp
b/saml/saml2/metadata/impl/XMLMetadataProvider.cpp
index
57bb4cf
..
ff9b262
100644
(file)
--- a/
saml/saml2/metadata/impl/XMLMetadataProvider.cpp
+++ b/
saml/saml2/metadata/impl/XMLMetadataProvider.cpp
@@
-152,8
+152,10
@@
XMLMetadataProvider::XMLMetadataProvider(const DOMElement* e)
pair<bool,DOMElement*> XMLMetadataProvider::load(bool backup)
{
pair<bool,DOMElement*> 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<bool,DOMElement*> raw = ReloadableXMLFile::load(backup);
// Call the base class to load/parse the appropriate XML resource.
pair<bool,DOMElement*> raw = ReloadableXMLFile::load(backup);
@@
-234,8
+236,8
@@
pair<bool,DOMElement*> XMLMetadataProvider::load(bool backup)
// Tracking cacheUntil through the tree is TBD, but
// validUntil is the tightest interval amongst the children.
// 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);
m_backoffFactor = 1;
m_reloadInterval = computeNextRefresh();
m_log.info("adjusted reload interval to %d seconds", m_reloadInterval);