[java-opensaml2 COMMIT] in /branches/REL_2: doc/RELEASE-NOTES.txt src/main/java/org/opensaml/saml2/metadata/provider/...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Oct 30 19:23:49 2013
New Revision: 1654

URL: http://svn.shibboleth.net/view/java-opensaml2?rev=1654&view=rev
Log:
JOST-218: AbstractMetadataProvider is incorrectly performing an unnecessary validity check and erroneous TRACE message

Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractMetadataProvider.java

Modified: branches/REL_2/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/doc/RELEASE-NOTES.txt?rev=1654&r1=1653&r2=1654&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Wed Oct 30 19:23:49 2013
@@ -3,6 +3,7 @@
 [JOST-210] - AbstractSAMLObject should not override equals but not hashCode
 [JOST-213] - Scoping class has incorrect xsi:type 
 [JOST-215] - Opensaml1 failed to pass veracode due Use of Wrong Operator in String Comparison (CWE ID 597) 
+[JOST-218] - AbstractMetadataProvider is incorrectly performing an unnecessary validity check and erroneous TRACE message
 
 Changes in Release 2.6.0
 =============================================

Modified: branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractMetadataProvider.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractMetadataProvider.java?rev=1654&r1=1653&r2=1654&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractMetadataProvider.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractMetadataProvider.java Wed Oct 30 19:23:49 2013
@@ -535,15 +535,14 @@
                 if (!DatatypeHelper.safeEquals(descriptor.getEntityID(), entityID)) {
                     // skip this one, it isn't what we're looking for
                     descriptor = null;
-                }
-                if (!isValid(descriptor)) {
+                } else if (!isValid(descriptor)) {
                     log.trace("Found entity descriptor for entity with ID {} but it is no longer valid, skipping it.",
                             entityID);
                     descriptor = null;
                 }
             } else {
-                log
-                        .trace("Metadata was an EntitiesDescriptor, checking if any of its descendant EntityDescriptor elements is the one we're looking for.");
+                log.trace("Metadata was an EntitiesDescriptor, checking if any of its descendant EntityDescriptor " 
+                        + "elements is the one we're looking for.");
                 if (metadata instanceof EntitiesDescriptor) {
                     descriptor = getEntityDescriptorById(entityID, (EntitiesDescriptor) metadata);
                 }