[java-opensaml2 COMMIT] in /branches/REL_2: doc/RELEASE-NOTES.txt src/main/java/org/opensaml/saml2/metadata/provider/...

[noreply at shibboleth.net]

Author: lajoie
Date: Sun Oct  9 14:56:23 2011
New Revision: 1553

URL: http://svn.shibboleth.net/view/java-opensaml2?rev=1553&view=rev
Log:
provide a means to explicitly destroy metadata providers and free up their resources - JOST-163

Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractMetadataProvider.java
    branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractObservableMetadataProvider.java
    branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java
    branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/BaseMetadataProvider.java
    branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/ChainingMetadataProvider.java
    branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/DOMMetadataProvider.java
    branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/FileBackedHTTPMetadataProvider.java
    branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/FilesystemMetadataProvider.java
    branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/HTTPMetadataProvider.java
    branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/ResourceBackedMetadataProvider.java

Modified: branches/REL_2/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/doc/RELEASE-NOTES.txt?rev=1553&r1=1552&r2=1553&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Sun Oct  9 14:56:23 2011
@@ -1,5 +1,6 @@
 Changes in Release 2.5.2
 =============================================
+[JOST-163] - No way to stop AbstractReloadingMetadataProvider threads
 [JOST-164] - MetadataProvider minRefreshDelay cannot be set greater than 4 hours
 [JOST-165] - Update 3rd party runtime library dependencies
 [JOST-171] - org.opensaml.saml2.metadata.provider.AbstractReloadingMetadataProvider:246 missing param in logging statement

Modified: branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractMetadataProvider.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractMetadataProvider.java?rev=1553&r1=1552&r2=1553&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractMetadataProvider.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractMetadataProvider.java Sun Oct  9 14:56:23 2011
@@ -414,6 +414,15 @@
                 log.error("Metadata provider failed to properly initializing, continuing on without metadata", e);
             }
         }
+    }
+    
+    /** {@inheritDoc} */
+    public synchronized void destroy() {
+        initialized = false;
+        indexedDescriptors = Collections.emptyMap();
+        parser = null;
+
+        super.destroy();        
     }
 
     /**

Modified: branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractObservableMetadataProvider.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractObservableMetadataProvider.java?rev=1553&r1=1552&r2=1553&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractObservableMetadataProvider.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractObservableMetadataProvider.java Sun Oct  9 14:56:23 2011
@@ -17,6 +17,7 @@
 
 package org.opensaml.saml2.metadata.provider;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
@@ -40,6 +41,13 @@
     /** {@inheritDoc} */
     public List<Observer> getObservers() {
         return observers;
+    }
+    
+    /** {@inheritDoc} */
+    public synchronized void destroy() {
+        observers = Collections.emptyList();
+
+        super.destroy();        
     }
 
     /**

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=1553&r1=1552&r2=1553&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 Sun Oct  9 14:56:23 2011
@@ -55,6 +55,12 @@
 
     /** Timer used to schedule background metadata update tasks. */
     private Timer taskTimer;
+    
+    /** Whether we created our own task timer during object construction.*/
+    private boolean createdOwnTaskTimer;

[... 237 lines stripped ...]