[java-identity-provider COMMIT] in /trunk/idp-core/src: main/java/net/shibboleth/idp/service/AbstractReloadableServic...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Dec  6 06:00:13 2013
New Revision: 5000

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5000&view=rev
Log:
IdP-330 Typo and more tidy for jenkins test failure

Modified:
    trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractReloadableService.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/service/ReloadableSpringService.java
    trunk/idp-core/src/test/java/net/shibboleth/idp/service/ReloadableSpringServiceTest.java

Modified: trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractReloadableService.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractReloadableService.java?rev=5000&r1=4999&r2=5000&view=diff
==============================================================================
--- trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractReloadableService.java (original)
+++ trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractReloadableService.java Fri Dec  6 06:00:13 2013
@@ -190,7 +190,7 @@
 
         if (reloadCheckDelay > 0) {
             if (null == reloadTaskTimer) {
-                log.info("{} no reload tast timer specified, creating default", getLogPrefix());
+                log.info("{} no reload task timer specified, creating default", getLogPrefix());
                 reloadTaskTimer = new Timer("Timer for " + getId());
             }
             log.info("{} reload time set to: {}, starting refresh thread", getLogPrefix(), reloadCheckDelay);

Modified: trunk/idp-core/src/main/java/net/shibboleth/idp/service/ReloadableSpringService.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/main/java/net/shibboleth/idp/service/ReloadableSpringService.java?rev=5000&r1=4999&r2=5000&view=diff
==============================================================================
--- trunk/idp-core/src/main/java/net/shibboleth/idp/service/ReloadableSpringService.java (original)
+++ trunk/idp-core/src/main/java/net/shibboleth/idp/service/ReloadableSpringService.java Fri Dec  6 06:00:13 2013
@@ -285,7 +285,9 @@
         // And tear down. Note that we are synchronized on this right now
         // and this will grab the lock - but that is OK because the ranking
         // is to lock this object, then the ServicableComponent.
-        oldComponent.unloadComponent();
+        if (null != oldComponent) {
+            oldComponent.unloadComponent();
+        }
     }
 
     /**

Modified: trunk/idp-core/src/test/java/net/shibboleth/idp/service/ReloadableSpringServiceTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/test/java/net/shibboleth/idp/service/ReloadableSpringServiceTest.java?rev=5000&r1=4999&r2=5000&view=diff
==============================================================================
--- trunk/idp-core/src/test/java/net/shibboleth/idp/service/ReloadableSpringServiceTest.java (original)
+++ trunk/idp-core/src/test/java/net/shibboleth/idp/service/ReloadableSpringServiceTest.java Fri Dec  6 06:00:13 2013
@@ -65,14 +65,14 @@
         createPopulatedFile("net/shibboleth/idp/service/ServiceableBean1.xml");
 
         service.setFailFast(true);
-        service.setId("Id");
+        service.setId("reloadableService");
         service.setReloadCheckDelay(RELOAD_DELAY);
         service.setServiceConfigurations(Collections.singletonList(testFileResource()));
 
         service.start();
 
         ServiceableComponent<TestServiceableComponent> serviceableComponent = service.getServiceableComponent();
-        TestServiceableComponent component  = serviceableComponent.getComponent();
+        TestServiceableComponent component = serviceableComponent.getComponent();
 
         Assert.assertEquals(component.getTheValue(), "One");
         Assert.assertFalse(component.getComponent().isDestroyed());
@@ -96,6 +96,7 @@
 
         Assert.assertEquals(serviceableComponent.getComponent().getTheValue(), "Two");
         serviceableComponent.unpinComponent();
+        service.stop();
     }
 
     @Test public void deferedReload() throws IOException, InterruptedException {
@@ -105,7 +106,7 @@
         createPopulatedFile("net/shibboleth/idp/service/ServiceableBean1.xml");
 
         service.setFailFast(true);
-        service.setId("Id");
+        service.setId("deferedReload");
         service.setReloadCheckDelay(RELOAD_DELAY);
         service.setServiceConfigurations(Collections.singletonList(testFileResource()));
 
@@ -130,6 +131,7 @@
             serviceableComponent = service.getServiceableComponent();
             component2 = serviceableComponent.getComponent();
             if ("Two".equals(component2.getTheValue())) {
+                component2.unpinComponent();
                 break;
             }
             component2.unpinComponent();
@@ -138,7 +140,7 @@
             count--;
         }
         Assert.assertNotNull("After 7 second initial component has still not got new value", component2);
-        
+

[... 101 lines stripped ...]