[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 Oct  5 16:01:22 2016
New Revision: 4512

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4512&view=rev
Log:
Rework some conditional logic to be semantically the same, but with clearer intent.

This is mostly so that Brent's brain doesn't swell every time he looks at it.

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=4512&r1=4511&r2=4512&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 Oct  5 16:01:22 2016
@@ -389,17 +389,16 @@
         try {
             readLock.lock();
             
-            if (!shouldAttemptRefresh(mgmtData)) {
-                final List<EntityDescriptor> descriptors = lookupEntityID(entityID);
-                if (!descriptors.isEmpty()) {
+            final List<EntityDescriptor> descriptors = lookupEntityID(entityID);
+            if (descriptors.isEmpty()) {
+                log.debug("Did not find requested metadata in backing store, will attempt to resolve dynamically");
+            } else {
+                if (shouldAttemptRefresh(mgmtData)) {
+                    log.debug("Metadata was indicated to be refreshed based on refresh trigger time");
+                } else {
                     log.debug("Found requested metadata in backing store");
                     candidates = descriptors;
-                } else {
-                    log.debug("Did not find requested metadata in backing store, will attempt to resolve dynamically");
                 }
-        
-            } else {
-                log.debug("Metadata was indicated to be refreshed based on refresh trigger time");
             }
         } finally {
             readLock.unlock();