[java-opensaml COMMIT] /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractRelo...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Feb 25 21:21:24 2013
New Revision: 3231

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3231&view=rev
Log:
Port java-opensaml2 r1550.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java?rev=3231&r1=3230&r2=3231&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java Mon Feb 25 21:21:24 2013
@@ -30,8 +30,6 @@
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.saml.saml2.common.SAML2Helper;
-import org.opensaml.saml.saml2.metadata.provider.FilterException;
-import org.opensaml.saml.saml2.metadata.provider.MetadataProviderException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -158,10 +156,6 @@
         if (delay < 0) {
             throw new IllegalArgumentException("Maximum refresh delay must be greater than 0");
         }
-        if (delay < minRefreshDelay) {
-            throw new IllegalArgumentException(
-                    "Maximum refresh delay must be greater than or equal to minimum refresh delay");
-        }
         maxRefreshDelay = delay;
     }
 
@@ -205,10 +199,6 @@
         if (delay < 0) {
             throw new IllegalArgumentException("Minimum refresh delay must be greater than 0");
         }
-        if (delay > maxRefreshDelay) {
-            throw new IllegalArgumentException(
-                    "Minimum refresh delay must be less than or equal to maximum refresh delay");
-        }
         minRefreshDelay = delay;
     }
 
@@ -220,6 +210,11 @@
     /** {@inheritDoc} */
     protected void doInitialization() throws MetadataProviderException {
         refresh();
+        
+        if (minRefreshDelay > maxRefreshDelay) {
+            throw new MetadataProviderException("Minimum refresh delay " + minRefreshDelay
+                    + " is greater than maximum refresh delay " + maxRefreshDelay);
+        }
     }
 
     /**
@@ -300,8 +295,8 @@
     protected void processCachedMetadata(String metadataIdentifier, DateTime refreshStart)
             throws MetadataProviderException {
         log.debug("Computing new expiration time for cached metadata from '{}", metadataIdentifier);
-        DateTime metadataExpirationTime = SAML2Helper.getEarliestExpiration(cachedMetadata, refreshStart
-                .plus(getMaxRefreshDelay()), refreshStart);
+        DateTime metadataExpirationTime = SAML2Helper.getEarliestExpiration(cachedMetadata,
+                refreshStart.plus(getMaxRefreshDelay()), refreshStart);
         log.debug("Expiration of cached metadata from '{}' will occur at {}", metadataIdentifier,
                 metadataExpirationTime.toString());
 
@@ -385,8 +380,8 @@
         postProcessMetadata(metadataBytes, metadataDom, metadata);
 
         log.debug("Computing expiration time for metadata from '{}'", metadataIdentifier);
-        DateTime metadataExpirationTime = SAML2Helper.getEarliestExpiration(metadata, refreshStart
-                .plus(getMaxRefreshDelay()), refreshStart);
+        DateTime metadataExpirationTime = SAML2Helper.getEarliestExpiration(metadata,
+                refreshStart.plus(getMaxRefreshDelay()), refreshStart);
         log.debug("Expiration of metadata from '{}' will occur at {}", metadataIdentifier, metadataExpirationTime
                 .toString());
 
@@ -394,10 +389,10 @@
         lastUpdate = refreshStart;
         
         long nextRefreshDelay;
-        if(metadataExpirationTime.isBeforeNow()){
+        if (metadataExpirationTime.isBeforeNow()) {
             expirationTime = new DateTime(ISOChronology.getInstanceUTC()).plus(getMinRefreshDelay());
             nextRefreshDelay = getMaxRefreshDelay();
-        }else{
+        } else {
             expirationTime = metadataExpirationTime;
             nextRefreshDelay = computeNextRefreshDelay(expirationTime);
         }