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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Mar 28 14:28:24 2013
New Revision: 4367

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4367&view=rev
Log:
Check for null task timer on stop.

Modified:
    trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractReloadableService.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=4367&r1=4366&r2=4367&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 Thu Mar 28 14:28:24 2013
@@ -204,7 +204,9 @@
 
     /** {@inheritDoc} */
     protected void doStop(@Nonnull final HashMap context) throws ServiceException {
-        reloadTask.cancel();
+        if (reloadTask != null) {
+            reloadTask.cancel();
+        }
         super.doStop(context);
     }