[java-shib-common COMMIT] /branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/Ab...

[noreply at shibboleth.net]

Author: putmanb
Date: Tue Feb 24 19:10:40 2015
New Revision: 1125

URL: http://svn.shibboleth.net/view/java-shib-common?rev=1125&view=rev
Log:
SIDP-624: No longer default taskTimerRef of reloading metadata providers.  If not explicitly supplied, build provider with a null Timer, which means it will create and manage its own internal Timer instance.

Modified:
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/AbstractReloadingMetadataProviderBeanDefinitionParser.java

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/AbstractReloadingMetadataProviderBeanDefinitionParser.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/AbstractReloadingMetadataProviderBeanDefinitionParser.java?rev=1125&r1=1124&r2=1125&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/AbstractReloadingMetadataProviderBeanDefinitionParser.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/AbstractReloadingMetadataProviderBeanDefinitionParser.java Tue Feb 24 19:10:40 2015
@@ -42,7 +42,12 @@
 
         String taskTimerRef = getTaskTimerRef(config);
         log.debug("Metadata provider using task timer: {}", taskTimerRef);
-        builder.addConstructorArgReference(taskTimerRef);
+        if (taskTimerRef != null) {
+            builder.addConstructorArgReference(taskTimerRef);
+        } else {
+            // See SIDP-624.  A null Timer ctor arg now causes provider to use its own internal Timer instance.
+            builder.addConstructorArgValue(null);
+        }
 
         float refreshDelayFactor = getRefreshDelayFactor(config);
         log.debug("Metadata provider refresh delay factor: {}", refreshDelayFactor);
@@ -89,10 +94,10 @@
         if (config.hasAttributeNS(null, "taskTimerRef")) {
             taskTimerRef = DatatypeHelper.safeTrimOrNullString(config.getAttributeNS(null, "taskTimerRef"));
         }
-
-        if (taskTimerRef == null) {
-            taskTimerRef = "shibboleth.TaskTimer";
-        }
+        
+        // Note: we no longer default anything here.  A null bean name is special-cased in doParse(...)
+        // and results in a 'null' value being passed as the Timer constructor arg.
+        // See SIDP-624.
 
         return taskTimerRef;
     }