[java-identity-provider COMMIT] in /trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn: AbstractAuthenticatio...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jul 29 21:09:16 2014
New Revision: 6359

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6359&view=rev
Log:
Some cleanup.

Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractAuthenticationAction.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicalizationAction.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction.java

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractAuthenticationAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractAuthenticationAction.java?rev=6359&r1=6358&r2=6359&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractAuthenticationAction.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractAuthenticationAction.java Tue Jul 29 21:09:16 2014
@@ -59,7 +59,7 @@
 
     /** Constructor. */
     public AbstractAuthenticationAction() {
-        authnCtxLookupStrategy = new ChildContextLookup<>(AuthenticationContext.class, false);
+        authnCtxLookupStrategy = new ChildContextLookup<>(AuthenticationContext.class);
     }
 
     /**

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicalizationAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicalizationAction.java?rev=6359&r1=6358&r2=6359&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicalizationAction.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicalizationAction.java Tue Jul 29 21:09:16 2014
@@ -167,11 +167,7 @@
             return false;
         }
         
-        if (doPreExecute(profileRequestContext, scContext)) {
-            return super.doPreExecute(profileRequestContext);
-        } else {
-            return false;
-        }
+        return doPreExecute(profileRequestContext, scContext) && super.doPreExecute(profileRequestContext);
     }
 
     /**

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction.java?rev=6359&r1=6358&r2=6359&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction.java Tue Jul 29 21:09:16 2014
@@ -215,6 +215,10 @@
             @Nonnull final ProfileRequestContext<InboundMessageType, OutboundMessageType> profileRequestContext,
             @Nonnull final AuthenticationContext authenticationContext) {
         
+        if (!super.doPreExecute(profileRequestContext, authenticationContext)) {
+            return false;
+        }
+        
         if (clearErrorContext) {
             authenticationContext.removeSubcontext(AuthenticationErrorContext.class);
         }
@@ -222,8 +226,7 @@
         // If the request mandates particular principals, evaluate this validating component to see if it
         // can produce a matching principal. This skips validators chained together in flows that aren't
         // able to satisfy the request.
-        final RequestedPrincipalContext rpCtx =
-                authenticationContext.getSubcontext(RequestedPrincipalContext.class, false);
+        final RequestedPrincipalContext rpCtx = authenticationContext.getSubcontext(RequestedPrincipalContext.class);
         if (principalsAdded && rpCtx != null && rpCtx.getOperator() != null) {
             log.debug("{} Request contains principal requirements, evaluating for compatibility", getLogPrefix());
             for (Principal p : rpCtx.getRequestedPrincipals()) {
@@ -252,7 +255,7 @@
             return false;
         }
         
-        return super.doPreExecute(profileRequestContext, authenticationContext);
+        return true;
     }
     
     /**