https://bugs.internet2.edu/jira/browse/SSPCPP-288

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/branches/REL_2@3246 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/shibsp/handler/impl/MetadataGenerator.cpp b/shibsp/handler/impl/MetadataGenerator.cpp
index de795a7..322b7e3 100644 (file)
--- a/shibsp/handler/impl/MetadataGenerator.cpp
+++ b/shibsp/handler/impl/MetadataGenerator.cpp
@@ -279,11 +279,9 @@ pair<bool,long> MetadataGenerator::processMessage(
     if (cache.first) {
         entity->setCacheDuration(cache.second);
     }
-    else {
-        cache = getUnsignedInt("validUntil");
-        if (cache.first)
-            entity->setValidUntil(time(NULL) + cache.second);
-    }
+    cache = getUnsignedInt("validUntil");
+    if (cache.first)
+        entity->setValidUntil(time(NULL) + cache.second);
     entity->setEntityID(relyingParty->getXMLString("entityID").second);
 
     SPSSODescriptor* role;