[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider: Abstract...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Feb 25 22:09:19 2013
New Revision: 3233

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3233&view=rev
Log:
Port java-opensaml2 r1553.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractObservableMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/BaseMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/ChainingMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/DOMMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/FileBackedHTTPMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/FilesystemMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/HTTPMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/ResourceBackedMetadataProvider.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractMetadataProvider.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractMetadataProvider.java?rev=3233&r1=3232&r2=3233&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractMetadataProvider.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractMetadataProvider.java Mon Feb 25 22:09:19 2013
@@ -421,6 +421,15 @@
         }
     }
 
+    /** {@inheritDoc} */
+    public synchronized void destroy() {
+        initialized = false;
+        indexedDescriptors = Collections.emptyMap();
+        parser = null;
+
+        super.destroy();        
+    }
+    
     /**
      * Subclasses should override this method to perform any initialization logic necessary. Default implementation is a
      * no-op.

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractObservableMetadataProvider.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractObservableMetadataProvider.java?rev=3233&r1=3232&r2=3233&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractObservableMetadataProvider.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractObservableMetadataProvider.java Mon Feb 25 22:09:19 2013
@@ -17,10 +17,9 @@
 
 package org.opensaml.saml.saml2.metadata.provider;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.opensaml.saml.saml2.metadata.provider.MetadataProvider;
 
 /**
  * An observable base implementation of metadata providers. An observer that clears the descriptor index kept by
@@ -43,11 +42,17 @@
     public List<Observer> getObservers() {
         return observers;
     }
+    
+    /** {@inheritDoc} */
+    public synchronized void destroy() {
+        observers = Collections.emptyList();
+
+        super.destroy();
+    }    
 
     /**
-     * Helper method for calling
-     * {@link org.opensaml.saml.saml2.metadata.provider.ObservableMetadataProvider.Observer#onEvent(MetadataProvider)} on
-     * every registered Observer passing in this provider.
+     * Helper method for calling {@link ObservableMetadataProvider.Observer#onEvent(MetadataProvider)}
+     * on every registered Observer passing in this provider.
      */
     protected void emitChangeEvent() {
         synchronized (observers) {

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java?rev=3233&r1=3232&r2=3233&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java Mon Feb 25 22:09:19 2013
@@ -55,7 +55,13 @@
 
     /** Timer used to schedule background metadata update tasks. */
     private Timer taskTimer;
-
+    

[... 296 lines stripped ...]