[java-opensaml COMMIT] /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/DefaultEndpointR...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Aug 19 11:46:01 2014
New Revision: 4004

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4004&view=rev
Log:
Short-circuit field comparison between the same objects.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/DefaultEndpointResolver.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/DefaultEndpointResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/DefaultEndpointResolver.java?rev=4004&r1=4003&r2=4004&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/DefaultEndpointResolver.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/DefaultEndpointResolver.java Tue Aug 19 11:46:01 2014
@@ -92,6 +92,7 @@
         return true;
     }
 
+// Checkstyle: CyclomaticComplexity OFF
     /**
      * Verify the candidate's attributes match any attributes supplied in the criterion.
      * 
@@ -103,6 +104,12 @@
             @Nonnull final EndpointType endpoint) {
 
         final EndpointType comparisonEndpoint = comparison.getEndpoint();
+
+        // Are we comparing ourselves, as in a signed request case?
+        if (comparisonEndpoint == endpoint) {
+            log.debug("{} Candidate endpoint was supplied by the criterion, skipping check", getLogPrefix());
+            return true;
+        }
         
         // Check binding.
         if (comparisonEndpoint.getBinding() != null &&
@@ -138,5 +145,6 @@
         
         return true;
     }
+// Checkstyle: CyclomaticComplexity ON
     
 }