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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Dec 31 11:23:42 2013
New Revision: 3540

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3540&view=rev
Log:
Bit of cleanup while reviewing, added a null check for parser.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolver.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java?rev=3540&r1=3539&r2=3540&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java Tue Dec 31 11:23:42 2013
@@ -52,11 +52,11 @@
     
     /** Constructor. */
     public AbstractBatchMetadataResolver() {
-        super();
         setCacheSourceMetadata(true);
     }
     
     /** {@inheritDoc} */
+    @Override
     public Iterator<EntityDescriptor> iterator() {
         ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
         return Collections.unmodifiableList(getBackingStore().getOrderedDescriptors()).iterator();
@@ -83,6 +83,7 @@
     }
     
     /** {@inheritDoc} */
+    @Override
     @Nonnull public Iterable<EntityDescriptor> resolve(CriteriaSet criteria) throws ResolverException {
         ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
         
@@ -100,11 +101,13 @@
     }
     
     /** {@inheritDoc} */
+    @Override
     @Nonnull protected BatchEntityBackingStore createNewBackingStore() {
         return new BatchEntityBackingStore();
     }
     
     /** {@inheritDoc} */
+    @Override
     @Nonnull protected BatchEntityBackingStore getBackingStore() {
         return (BatchEntityBackingStore) super.getBackingStore();
     }

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java?rev=3540&r1=3539&r2=3540&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java Tue Dec 31 11:23:42 2013
@@ -40,7 +40,6 @@
 import net.shibboleth.utilities.java.support.xml.ParserPool;
 import net.shibboleth.utilities.java.support.xml.QNameSupport;
 
-import org.opensaml.core.criterion.EntityIdCriterion;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
 import org.opensaml.core.xml.io.Unmarshaller;
@@ -88,18 +87,19 @@
 
     /** Constructor. */
     public AbstractMetadataResolver() {
-        super();
         failFastInitialization = true;
         unmarshallerFactory = XMLObjectProviderRegistrySupport.getUnmarshallerFactory();
         setId(UUID.randomUUID().toString());
     }
     
     /** {@inheritDoc} */
+    @Override
     public boolean isRequireValidMetadata() {
         return requireValidMetadata;
     }
 
     /** {@inheritDoc} */
+    @Override
     public void setRequireValidMetadata(boolean require) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
@@ -161,6 +161,7 @@
     }
     
     /** {@inheritDoc} */
+    @Override
     @Nullable public EntityDescriptor resolveSingle(CriteriaSet criteria) throws ResolverException {
         ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
         
@@ -184,7 +185,10 @@
     }
 
     /** {@inheritDoc} */
+    @Override
     protected final void doInitialize() throws ComponentInitializationException {
+        super.doInitialize();
+        
         try {
             initMetadataResolver();
         } catch (ComponentInitializationException e) {
@@ -199,6 +203,7 @@
     }
 
     /** {@inheritDoc} */
+    @Override
     protected void doDestroy() {
         unmarshallerFactory = null;
         mdFilter = null;
@@ -232,6 +237,9 @@
             throws UnmarshallingException {
         
         try {
+            if (parser == null) {

[... 157 lines stripped ...]