[java-metadata-aggregator COMMIT] /trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpCac...

[noreply at shibboleth.net]

Author: iay
Date: Fri Mar 15 17:41:53 2013
New Revision: 230

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=230&view=rev
Log:
MDA-83 PullUpCacheDurationStage ignores cacheDuration on EntityDescriptor elements

Modified:
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage.java

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage.java?rev=230&r1=229&r2=230&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage.java Fri Mar 15 17:41:53 2013
@@ -104,7 +104,7 @@
     }
 
     /**
-     * Gets the shorts cache duration for a given entity and entities descriptor an all its descendant descriptors.
+     * Gets the shortest cache duration for a given entity or entities descriptor and all its descendant descriptors.
      * 
      * @param descriptor descriptor from which to get the shortest cache duration
      * 
@@ -113,7 +113,7 @@
      */
     protected Long getShortestCacheDuration(@Nonnull final Element descriptor) {
         Long shortestCacheDuration = null;
-        if (!SamlMetadataSupport.isEntitiesDescriptor(descriptor)) {
+        if (!SamlMetadataSupport.isEntityOrEntitiesDescriptor(descriptor)) {
             return shortestCacheDuration;
         }