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

[noreply at shibboleth.net]

Author: lajoie
Date: Mon Oct 17 16:08:35 2011
New Revision: 1555

URL: http://svn.shibboleth.net/view/java-opensaml2?rev=1555&view=rev
Log:
When selecting an endpoint by ACS URL, don't check the Location at all if there is a ResponseLocation - JOST-173

Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/src/main/java/org/opensaml/saml2/binding/AuthnResponseEndpointSelector.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=1555&r1=1554&r2=1555&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Mon Oct 17 16:08:35 2011
@@ -5,6 +5,7 @@
 [JOST-164] - MetadataProvider minRefreshDelay cannot be set greater than 4 hours
 [JOST-165] - Update 3rd party runtime library dependencies
 [JOST-171] - org.opensaml.saml2.metadata.provider.AbstractReloadingMetadataProvider:246 missing param in logging statement
+[JOST-173] - Wrong Treatment of ResponseLocation and Location in Metadata
 
 Changes in Release 2.5.1
 =============================================

Modified: branches/REL_2/src/main/java/org/opensaml/saml2/binding/AuthnResponseEndpointSelector.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/saml2/binding/AuthnResponseEndpointSelector.java?rev=1555&r1=1554&r2=1555&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/saml2/binding/AuthnResponseEndpointSelector.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/saml2/binding/AuthnResponseEndpointSelector.java Mon Oct 17 16:08:35 2011
@@ -62,16 +62,14 @@
             }
 
             if (request.getAssertionConsumerServiceIndex() != null) {
-                log.debug("Selecting endpoint by ACS index '{}' for request '{}' from entity '{}'",
-                        new Object[] { request.getAssertionConsumerServiceIndex(), request.getID(),
-                                getEntityMetadata().getEntityID() });
+                log.debug("Selecting endpoint by ACS index '{}' for request '{}' from entity '{}'", new Object[] {
+                        request.getAssertionConsumerServiceIndex(), request.getID(), getEntityMetadata().getEntityID()});
                 endpoint = selectEndpointByACSIndex(request, (List<IndexedEndpoint>) endpoints);
             } else if (request.getAssertionConsumerServiceURL() != null) {
-                log
-                        .debug(
-                                "Selecting endpoint by ACS URL '{}' and protocol binding '{}' for request '{}' from entity '{}'",
-                                new Object[] { request.getAssertionConsumerServiceURL(), request.getProtocolBinding(),
-                                        request.getID(), getEntityMetadata().getEntityID() });
+                log.debug(
+                        "Selecting endpoint by ACS URL '{}' and protocol binding '{}' for request '{}' from entity '{}'",
+                        new Object[] {request.getAssertionConsumerServiceURL(), request.getProtocolBinding(),
+                                request.getID(), getEntityMetadata().getEntityID()});
                 endpoint = selectEndpointByACSURL(request, (List<IndexedEndpoint>) endpoints);
             }
         }
@@ -141,10 +139,9 @@
         Integer acsIndex = request.getAssertionConsumerServiceIndex();
         for (IndexedEndpoint endpoint : endpoints) {
             if (endpoint == null || !getSupportedIssuerBindings().contains(endpoint.getBinding())) {
-                log
-                        .debug(
-                                "Endpoint '{}' with binding '{}' discarded because it requires an unsupported outbound binding.",
-                                endpoint.getLocation(), endpoint.getBinding());
+                log.debug(
+                        "Endpoint '{}' with binding '{}' discarded because it requires an unsupported outbound binding.",
+                        endpoint.getLocation(), endpoint.getBinding());
                 continue;
             }
 
@@ -152,7 +149,7 @@
                 return endpoint;
             } else {
                 log.debug("Endpoint '{}' with index '{}' discard because it does have the required index '{}'",
-                        new Object[] { endpoint.getLocation(), endpoint.getIndex(), acsIndex });
+                        new Object[] {endpoint.getLocation(), endpoint.getIndex(), acsIndex});
             }
         }
 
@@ -183,27 +180,33 @@
 
             if (acsBinding != null) {
                 if (!DatatypeHelper.safeEquals(acsBinding, endpoint.getBinding())) {
-                    log.debug("Endpoint '{}' with binding '{}' discarded because it does not meet protocol binding selection criteria",
-                                    endpoint.getLocation(), endpoint.getBinding());
+                    log.debug(

[... 41 lines stripped ...]