[utilities COMMIT] in /spring-extensions/trunk/src: main/java/net/shibboleth/ext/spring/service/ReloadableSpringServi...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Feb 10 13:16:44 2015
New Revision: 745

URL: http://svn.shibboleth.net/view/utilities?rev=745&view=rev
Log:
Explicitly test for non reloading.  Log non reloading at trace (very noisy, so trace)

Modified:
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java
    spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTest.java

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java?rev=745&r1=744&r2=745&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java Tue Feb 10 13:16:44 2015
@@ -303,6 +303,8 @@
                         log.debug("{} Resource has changed: '{}'", getLogPrefix(), serviceConfig.getDescription());
                         configResourceChanged = true;
                         resourceLastModifiedTimes[i] = serviceConfigLastModified;
+                    } else {
+                        log.trace("{} Resource has not changed '{}'", getLogPrefix(), serviceConfig.getDescription());
                     }
                 }
             } catch (final IOException e) {

Modified: spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTest.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTest.java?rev=745&r1=744&r2=745&view=diff
==============================================================================
--- spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTest.java (original)
+++ spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTest.java Tue Feb 10 13:16:44 2015
@@ -26,6 +26,7 @@
 import net.shibboleth.ext.spring.util.SpringSupport;
 import net.shibboleth.utilities.java.support.service.ServiceableComponent;
 
+import org.joda.time.DateTime;
 import org.springframework.beans.factory.BeanInitializationException;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.BeanPostProcessor;
@@ -121,8 +122,13 @@
         ServiceableComponent<TestServiceableComponent> serviceableComponent = service.getServiceableComponent();
         TestServiceableComponent component = serviceableComponent.getComponent();
 
+        final DateTime x = service.getLastReloadAttemptInstant();
+        Assert.assertEquals(x,  service.getLastSuccessfulReloadInstant());
+        
         Assert.assertEquals(component.getTheValue(), "One");
         Assert.assertFalse(component.isDestroyed());
+        Thread.sleep(RELOAD_DELAY*3);
+        Assert.assertEquals(x,  service.getLastReloadAttemptInstant());
 
         overwriteFileWith("net/shibboleth/ext/spring/service/ServiceableBean2.xml");