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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Feb  4 22:47:17 2014
New Revision: 5314

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5314&view=rev
Log:
Fix check for "empty" RP context.

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

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SelectAuthenticationFlow.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SelectAuthenticationFlow.java?rev=5314&r1=5313&r2=5314&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SelectAuthenticationFlow.java (original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SelectAuthenticationFlow.java Tue Feb  4 22:47:17 2014
@@ -124,7 +124,8 @@
     protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext,
             @Nonnull final AuthenticationContext authenticationContext) throws AuthenticationException {
 
-        if (requestedPrincipalCtx == null && requestedPrincipalCtx.getOperator() != null) {
+        if (requestedPrincipalCtx == null || requestedPrincipalCtx.getOperator() == null
+                || requestedPrincipalCtx.getRequestedPrincipals().isEmpty()) {
             doSelectNoRequestedPrincipals(profileRequestContext, authenticationContext);
         } else {
             doSelectRequestedPrincipals(profileRequestContext, authenticationContext);