From: Scott Cantor <cantor.2@osu.edu>
Date: Thu, 1 Apr 2010 21:51:28 +0000 (+0000)
Subject: https://issues.shibboleth.net/jira/browse/SSPCPP-288
X-Git-Tag: 2.4RC1~118
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=e01e83148e19c5bb622814738ae44f7a3ac167cc;p=shibboleth%2Fcpp-sp.git

https://issues.shibboleth.net/jira/browse/SSPCPP-288
---

diff --git a/shibsp/handler/impl/MetadataGenerator.cpp b/shibsp/handler/impl/MetadataGenerator.cpp
index de795a7..322b7e3 100644
--- 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;