[java-identity-provider COMMIT] /trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SelectSubjectCanoni...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Feb 19 12:17:43 2014
New Revision: 5399

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5399&view=rev
Log:
Make the currently-under-investigation flow available to the flow predicates via the attemptedFlow Field

Modified:
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SelectSubjectCanonicalizationFlow.java

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SelectSubjectCanonicalizationFlow.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SelectSubjectCanonicalizationFlow.java?rev=5399&r1=5398&r2=5399&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SelectSubjectCanonicalizationFlow.java (original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SelectSubjectCanonicalizationFlow.java Wed Feb 19 12:17:43 2014
@@ -21,9 +21,9 @@
 import javax.annotation.Nullable;
 
 import net.shibboleth.idp.authn.AbstractSubjectCanonicalizationAction;
+import net.shibboleth.idp.authn.AuthnEventIds;
 import net.shibboleth.idp.authn.SubjectCanonicalizationException;
 import net.shibboleth.idp.authn.SubjectCanonicalizationFlowDescriptor;
-import net.shibboleth.idp.authn.AuthnEventIds;
 import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
 
 import org.opensaml.profile.action.ActionSupport;
@@ -98,9 +98,11 @@
             if (!c14nContext.getIntermediateFlows().containsKey(flow.getId())) {
                 log.debug("{} Checking canonicalization flow {} for applicability...", getLogPrefix(),
                         flow.getId());
+                c14nContext.setAttemptedFlow(flow);
                 if (flow.apply(profileRequestContext)) {
                     return flow;
                 }
+                c14nContext.setAttemptedFlow(null);
                 log.debug("{} Canonicalization flow {} was not applicable to this request", getLogPrefix(),
                         flow.getId());