[java-opensaml COMMIT] in /trunk: opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/Bas...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Feb 25 05:09:22 2015
New Revision: 4240

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4240&view=rev
Log:
IDP-625 make all timers daemons

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolverTest.java
    trunk/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractStorageService.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java?rev=4240&r1=4239&r2=4240&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java Wed Feb 25 05:09:22 2015
@@ -78,11 +78,11 @@
     /** {@inheritDoc} */
     @Override protected void doInitialize() throws ComponentInitializationException {
         super.doInitialize();
-        artifactStore = new ConcurrentHashMap<String, ExpiringSAMLArtifactMapEntry>();
+        artifactStore = new ConcurrentHashMap<>();
 
         if (cleanupInterval > 0) {
             cleanupTask = new Cleanup();
-            cleanupTaskTimer = new Timer();
+            cleanupTaskTimer = new Timer(true);
             cleanupTaskTimer.schedule(cleanupTask, cleanupInterval * 1000, cleanupInterval * 1000);
         }
     }

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolverTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolverTest.java?rev=4240&r1=4239&r2=4240&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolverTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolverTest.java Wed Feb 25 05:09:22 2015
@@ -51,7 +51,7 @@
                 .getResource("/data/org/opensaml/saml/saml2/metadata/InCommon-metadata.xml");
         Resource mdResource = ResourceHelper.of(new FileSystemResource(new File(mdURL.toURI()).getAbsolutePath()));
 
-        metadataProvider = new ResourceBackedMetadataResolver(new Timer(), mdResource);
+        metadataProvider = new ResourceBackedMetadataResolver(new Timer(true), mdResource);
         metadataProvider.setParserPool(parserPool);
         metadataProvider.setMaxRefreshDelay(500000);
         metadataProvider.setId("test");

Modified: trunk/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractStorageService.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractStorageService.java?rev=4240&r1=4239&r2=4240&view=diff
==============================================================================
--- trunk/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractStorageService.java (original)
+++ trunk/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractStorageService.java Wed Feb 25 05:09:22 2015
@@ -170,7 +170,7 @@
             if (cleanupTask == null) {
                 throw new ComponentInitializationException("Cleanup task cannot be null if cleanupInterval is set.");
             } else if (cleanupTaskTimer == null) {
-                internalTaskTimer = new Timer();
+                internalTaskTimer = new Timer(true);
             } else {
                 internalTaskTimer = cleanupTaskTimer;
             }