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

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Sep  7 20:57:41 2016
New Revision: 4483

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4483&view=rev
Log:
Fix conditional issue from recent predicate criteria work.

Only resolve from origin source if don't have non-null candidates.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java?rev=4483&r1=4482&r2=4483&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java	(original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java	Wed Sep  7 20:57:41 2016
@@ -291,7 +291,7 @@
         
         EntityManagementData mgmtData = getBackingStore().getManagementData(entityID);
         Lock readLock = mgmtData.getReadWriteLock().readLock();
-        Iterable<EntityDescriptor> candidates;
+        Iterable<EntityDescriptor> candidates = null;
         try {
             readLock.lock();
             
@@ -311,7 +311,9 @@
             readLock.unlock();
         }
         
-        candidates = resolveFromOriginSource(criteria);
+        if (candidates == null) {
+            candidates = resolveFromOriginSource(criteria);
+        }
         
         return predicateFilterCandidates(candidates, criteria, false);
     }