[java-opensaml] branch master updated: OSJ-214: Make sure all internally-created Timers have names

[Brent Putman]

This is an automated email from the git hooks/post-receive script.

putmanb pushed a commit to branch master
in repository java-opensaml.

View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=2db5c8fcb7adb88c06a085487931bb16bb640dcc

The following commit(s) were added to refs/heads/master by this push:
       new  2db5c8f   OSJ-214: Make sure all internally-created Timers have names
2db5c8f is described below

commit 2db5c8fcb7adb88c06a085487931bb16bb640dcc
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Wed Aug 16 20:15:40 2017 -0400

    OSJ-214: Make sure all internally-created Timers have names
---
 .../saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java        | 3 ++-
 .../saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java   | 3 ++-
 .../saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java | 3 ++-
 .../src/main/java/org/opensaml/storage/AbstractStorageService.java     | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java
index 741186f..413f0f8 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java
@@ -35,6 +35,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
 import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.primitive.TimerSupport;
 
 import org.joda.time.DateTime;
 import org.opensaml.saml.common.SAMLObject;
@@ -82,7 +83,7 @@ public class BasicSAMLArtifactMap extends AbstractInitializableComponent impleme
 
         if (cleanupInterval > 0) {
             cleanupTask = new Cleanup();
-            cleanupTaskTimer = new Timer(true);
+            cleanupTaskTimer = new Timer(TimerSupport.getTimerName(this), true);
             cleanupTaskTimer.schedule(cleanupTask, cleanupInterval * 1000, cleanupInterval * 1000);
         }
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java
index 68f8556..8dd6297 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java
@@ -72,6 +72,7 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.utilities.java.support.primitive.TimerSupport;
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
 
@@ -176,7 +177,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
         super();
         
         if (backgroundTaskTimer == null) {
-            taskTimer = new Timer(true);
+            taskTimer = new Timer(TimerSupport.getTimerName(this), true);
             createdOwnTaskTimer = true;
         } else {
             taskTimer = backgroundTaskTimer;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java
index 48881a7..c2adf88 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java
@@ -44,6 +44,7 @@ import net.shibboleth.utilities.java.support.annotation.Duration;
 import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
+import net.shibboleth.utilities.java.support.primitive.TimerSupport;
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
 
 /**
@@ -130,7 +131,7 @@ public abstract class AbstractReloadingMetadataResolver extends AbstractBatchMet
         setCacheSourceMetadata(true);
         
         if (backgroundTaskTimer == null) {
-            taskTimer = new Timer(true);
+            taskTimer = new Timer(TimerSupport.getTimerName(this), true);
             createdOwnTaskTimer = true;
         } else {
             taskTimer = backgroundTaskTimer;
diff --git a/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractStorageService.java b/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractStorageService.java
index d964214..a76ea97 100644
--- a/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractStorageService.java
+++ b/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractStorageService.java
@@ -32,6 +32,7 @@ import net.shibboleth.utilities.java.support.component.AbstractIdentifiableIniti
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.primitive.TimerSupport;
 
 import org.opensaml.storage.annotation.AnnotationSupport;
 
@@ -170,7 +171,7 @@ public abstract class AbstractStorageService extends AbstractIdentifiableInitial
             if (cleanupTask == null) {
                 throw new ComponentInitializationException("Cleanup task cannot be null if cleanupInterval is set.");
             } else if (cleanupTaskTimer == null) {
-                internalTaskTimer = new Timer(true);
+                internalTaskTimer = new Timer(TimerSupport.getTimerName(this), true);
             } else {
                 internalTaskTimer = cleanupTaskTimer;
             }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.