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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jul  9 12:52:37 2014
New Revision: 6256

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6256&view=rev
Log:
IDP-435 - untested fix, need to skip principal check when validator isn't customizing principal set

Modified:
    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/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=6256&r1=6255&r2=6256&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 Wed Jul  9 12:52:37 2014
@@ -158,7 +158,7 @@
      * 
      * @param strategy lookup strategy
      */
-    public synchronized void setRequesterLookupStrategy(
+    public void setRequesterLookupStrategy(
             @Nullable final Function<ProfileRequestContext,String> strategy) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
 
@@ -170,7 +170,7 @@
      * 
      * @param strategy lookup strategy
      */
-    public synchronized void setResponderLookupStrategy(
+    public void setResponderLookupStrategy(
             @Nullable final Function<ProfileRequestContext,String> strategy) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
 
@@ -193,7 +193,7 @@
      */
     public <T extends Principal> void setSupportedPrincipals(@Nonnull @NonnullElements final Collection<T> principals) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
-        Constraint.isNotNull(principals, "Principal collection cannot be null.");
+        Constraint.isNotNull(principals, "Principal collection cannot be null");
         
         principalsAdded = true;
         authenticatedSubject.getPrincipals().clear();
@@ -220,7 +220,7 @@
         // able to satisfy the request.
         final RequestedPrincipalContext rpCtx =
                 authenticationContext.getSubcontext(RequestedPrincipalContext.class, false);
-        if (rpCtx != null && rpCtx.getOperator() != null) {
+        if (principalsAdded && rpCtx != null && rpCtx.getOperator() != null) {
             log.debug("{} Request contains principal requirements, evaluating for compatibility", getLogPrefix());
             for (Principal p : rpCtx.getRequestedPrincipals()) {
                 final PrincipalEvalPredicateFactory factory =