[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/ECPConte...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Jul 17 14:34:01 2014
New Revision: 3963

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3963&view=rev
Log:
IDP-415: RequestAuthenticated and GeneratedKey SOAP header handlers.

Added:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/ECPContext.java   (with props)
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/impl/AddGeneratedKeyHeaderHandler.java   (with props)
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/impl/AddRequestAuthenticatedHeaderHandler.java   (with props)
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddGeneratedKeyHeaderHandlerTest.java   (with props)
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddRequestAuthenticatedHeaderHandlerTest.java   (with props)
Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/impl/AddECPResponseHeaderHandler.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/impl/AddECPResponseHeaderHandler.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/impl/AddECPResponseHeaderHandler.java?rev=3963&r1=3962&r2=3963&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/impl/AddECPResponseHeaderHandler.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/impl/AddECPResponseHeaderHandler.java Thu Jul 17 14:34:01 2014
@@ -43,23 +43,16 @@
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(AddECPResponseHeaderHandler.class);
     
-    /** Builder for response header. */
-    @Nonnull private final SAMLObjectBuilder<Response> responseBuilder;
-
     /** The location to record in the header. */
     @Nullable private URI assertionConsumerURL;
-    
-    /** Constructor. */
-    public AddECPResponseHeaderHandler() {
-        responseBuilder = (SAMLObjectBuilder<Response>)
-                XMLObjectProviderRegistrySupport.getBuilderFactory().<Response>getBuilderOrThrow(
-                        Response.DEFAULT_ELEMENT_NAME);
-    }
-    
 
     /** {@inheritDoc} */
     @Override
     protected boolean doPreInvoke(@Nonnull final MessageContext messageContext) throws MessageHandlerException {
+        
+        if (!super.doPreInvoke(messageContext)) {
+            return false;
+        }
         
         try {
             assertionConsumerURL = SAMLBindingSupport.getEndpointURL(messageContext);
@@ -68,12 +61,15 @@
             return false;
         }
         
-        return super.doPreInvoke(messageContext);
+        return true;
     }
 
     /** {@inheritDoc} */
     @Override
     protected void doInvoke(@Nonnull final MessageContext messageContext) throws MessageHandlerException {
+        final SAMLObjectBuilder<Response> responseBuilder = (SAMLObjectBuilder<Response>)
+                XMLObjectProviderRegistrySupport.getBuilderFactory().<Response>getBuilderOrThrow(
+                        Response.DEFAULT_ELEMENT_NAME);
         
         final Response header = responseBuilder.buildObject();
         header.setAssertionConsumerServiceURL(assertionConsumerURL.toString());