[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl: ChainingM...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Sep 11 21:20:20 2013
New Revision: 3443

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3443&view=rev
Log:
Move CompositeMetadataResolver down from IdP to OpenSAML.  Refactor to make it actually implement the MetadataResolver inteface.
Add some missing component support calls to ChainingMetadataResolver.

Added:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/CompositeMetadataResolver.java   (with props)
Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolver.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolver.java?rev=3443&r1=3442&r2=3443&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolver.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolver.java Wed Sep 11 21:20:20 2013
@@ -22,6 +22,7 @@
 
 import javax.annotation.Nonnull;
 
+import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
 
@@ -69,6 +70,9 @@
      * @throws ResolverException thrown if there is a problem adding the metadata provider
      */
     public void setResolvers(List<MetadataResolver> newResolvers) throws ResolverException {
+        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+        ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
+        
         if (newResolvers == null || newResolvers.isEmpty()) {
             resolvers = Collections.emptyList();
             return;
@@ -101,6 +105,8 @@
     
     /** {@inheritDoc} */
     @Nonnull public Iterable<EntityDescriptor> resolve(CriteriaSet criteria) throws ResolverException {
+        ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
+        
         for (MetadataResolver resolver : resolvers) {
             try {
                 Iterable<EntityDescriptor> descriptors = resolver.resolve(criteria);