[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 22:24:43 2013
New Revision: 3234

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

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=3234&r1=3233&r2=3234&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 22:24:43 2013
@@ -213,7 +213,7 @@
     public synchronized void destroy() {
         refresMetadataTask.cancel();
         
-        if(createdOwnTaskTimer){
+        if (createdOwnTaskTimer) {
             taskTimer.cancel();
         }
         
@@ -256,20 +256,20 @@
             if (mdBytes == null) {
                 log.debug("Metadata from '{}' has not changed since last refresh", mdId);
                 processCachedMetadata(mdId, now);
-                log.info(
-                        "Metadata from '{}' unchanged since last refresh, next refresh will occur at approximately {}",
-                        getMetadataIdentifier(), nextRefresh);
             } else {
                 log.debug("Processing new metadata from '{}'", mdId);
                 processNewMetadata(mdId, now, mdBytes);
             }
         } catch (Exception e) {
-            log.debug("Error occurred while attempting to refresh metadata from '{}', "
-                    + "next refresh will occur in approximately {}ms", mdId, minRefreshDelay);
-            refresMetadataTask = new RefreshMetadataTask();
-            taskTimer.schedule(refresMetadataTask, minRefreshDelay);
+            log.debug("Error occurred while attempting to refresh metadata from '" + mdId + "'", e);
+            nextRefresh = new DateTime(ISOChronology.getInstanceUTC()).plus(minRefreshDelay);
             throw new MetadataProviderException(e);
         } finally {
+            refresMetadataTask = new RefreshMetadataTask();
+            long nextRefreshDelay = nextRefresh.getMillis() - System.currentTimeMillis();
+            taskTimer.schedule(refresMetadataTask, nextRefreshDelay);
+            log.info("Next refresh cycle for metadata provider '{}' will occur on '{}' ('{}' local time)",
+                    new Object[] {mdId, nextRefresh, nextRefresh.toDateTime(DateTimeZone.getDefault()),});
             lastRefresh = now;
         }
     }
@@ -322,13 +322,10 @@
         log.debug("Computing new expiration time for cached metadata from '{}", metadataIdentifier);
         DateTime metadataExpirationTime = SAML2Helper.getEarliestExpiration(cachedMetadata,
                 refreshStart.plus(getMaxRefreshDelay()), refreshStart);
-        log.debug("Expiration of cached metadata from '{}' will occur at {}", metadataIdentifier,
-                metadataExpirationTime.toString());
 
         expirationTime = metadataExpirationTime;
         long nextRefreshDelay = computeNextRefreshDelay(expirationTime);
         nextRefresh = new DateTime(ISOChronology.getInstanceUTC()).plus(nextRefreshDelay);
-        taskTimer.schedule(new RefreshMetadataTask(), nextRefreshDelay);
     }
 
     /**
@@ -365,13 +362,11 @@
      */
     protected void processPreExpiredMetadata(String metadataIdentifier, DateTime refreshStart, byte[] metadataBytes,
             XMLObject metadata) {
-        log.warn("Entire metadata document from '{}' was expired at time of loading", metadataIdentifier);
+        log.warn("Entire metadata document from '{}' was expired at time of loading, existing metadata retained",
+                metadataIdentifier);
 
         lastUpdate = refreshStart;
-        taskTimer.schedule(new RefreshMetadataTask(), getMinRefreshDelay());
         nextRefresh = new DateTime(ISOChronology.getInstanceUTC()).plus(getMinRefreshDelay());
-        log.info("Existing metadata retained, next refresh from '{}' will occur at approximately {}",
-                getMetadataIdentifier(), nextRefresh);
     }
 
     /**
@@ -421,12 +416,10 @@
             expirationTime = metadataExpirationTime;
             nextRefreshDelay = computeNextRefreshDelay(expirationTime);
         }
-        taskTimer.schedule(new RefreshMetadataTask(), nextRefreshDelay);
         nextRefresh = new DateTime(ISOChronology.getInstanceUTC()).plus(nextRefreshDelay);
 
         emitChangeEvent();
-        log.info("New metadata loaded from '{}', next refresh will occur at approximately {}", getMetadataIdentifier(),
-                nextRefresh.toDateTime(DateTimeZone.getDefault()));

[... 19 lines stripped ...]