[java-opensaml2 COMMIT] /branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractReloadingMetadataP...

[noreply at shibboleth.net]

Author: putmanb
Date: Tue Feb 24 19:09:24 2015
New Revision: 1680

URL: http://svn.shibboleth.net/view/java-opensaml2?rev=1680&view=rev
Log:
SIDP-624: Allow reloading metadata providers to accept explicitly null Timer ctor arg, to signal use of own internal Timer.

Modified:
    branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java

Modified: branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java?rev=1680&r1=1679&r2=1680&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java Tue Feb 24 19:09:24 2015
@@ -91,8 +91,7 @@
 
     /** Constructor. */
     protected AbstractReloadingMetadataProvider() {
-        taskTimer = new Timer(true);
-        createdOwnTaskTimer = true;
+        this(null);
     }
 
     /**
@@ -102,9 +101,13 @@
      */
     protected AbstractReloadingMetadataProvider(Timer backgroundTaskTimer) {
         if (backgroundTaskTimer == null) {
-            throw new IllegalArgumentException("Task timer may not be null");
-        }
-        taskTimer = backgroundTaskTimer;
+            log.debug("Creating own background task Timer instance");
+            taskTimer = new Timer(true);
+            createdOwnTaskTimer = true;
+        } else {
+            log.debug("Using ctor arg-supplied background task Timer instance");
+            taskTimer = backgroundTaskTimer;
+        }
     }
 
     /**