Adjust default cache timeout based on cache subclass.

[shibboleth/sp.git] / shibsp / impl / StorageServiceSessionCache.cpp

diff --git a/shibsp/impl/StorageServiceSessionCache.cpp b/shibsp/impl/StorageServiceSessionCache.cpp
index f310a55..ae2135e 100644 (file)
--- a/shibsp/impl/StorageServiceSessionCache.cpp
+++ b/shibsp/impl/StorageServiceSessionCache.cpp
@@ -112,16 +112,16 @@ namespace shibsp {
             return m_attributes;
         }
         const multimap<string,const Attribute*>& getIndexedAttributes() const {
-            if (m_attributeIndex.empty()) {\r
-                if (m_attributes.empty())\r
-                    unmarshallAttributes();\r
-                for (vector<Attribute*>::const_iterator a = m_attributes.begin(); a != m_attributes.end(); ++a) {\r
-                    const vector<string>& aliases = (*a)->getAliases();\r
-                    for (vector<string>::const_iterator alias = aliases.begin(); alias != aliases.end(); ++alias)\r
-                        m_attributeIndex.insert(make_pair(*alias, *a));\r
-                }\r
-            }\r
-            return m_attributeIndex;\r
+            if (m_attributeIndex.empty()) {
+                if (m_attributes.empty())
+                    unmarshallAttributes();
+                for (vector<Attribute*>::const_iterator a = m_attributes.begin(); a != m_attributes.end(); ++a) {
+                    const vector<string>& aliases = (*a)->getAliases();
+                    for (vector<string>::const_iterator alias = aliases.begin(); alias != aliases.end(); ++alias)
+                        m_attributeIndex.insert(make_pair(*alias, *a));
+                }
+            }
+            return m_attributeIndex;
         }
         const vector<const char*>& getAssertionIDs() const {
             if (m_ids.empty()) {
@@ -450,7 +450,7 @@ void StoredSession::addAssertion(Assertion* assertion)
 }
 
 SSCache::SSCache(const DOMElement* e)
-    : SessionCache(e), m_log(Category::getInstance(SHIBSP_LOGCAT".SessionCache")), m_storage(NULL)
+    : SessionCache(e, 3600), m_log(Category::getInstance(SHIBSP_LOGCAT".SessionCache")), m_storage(NULL)
 {
     SPConfig& conf = SPConfig::getConfig();
     const XMLCh* tag = e ? e->getAttributeNS(NULL,_StorageService) : NULL;