[java-identity-provider COMMIT] /branches/3.1/idp-authn-api/src/main/java/net/shibboleth/idp/authn/ExternalAuthentica...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Jun 22 07:10:56 2015
New Revision: 7585

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7585&view=rev
Log:
IDP-744 Allow ExternalAuthentication.start to return an empty conversation key

Manual merge of fix http://svn.shibboleth.net/view/java-identity-provider?view=revision&revision=7574 to https://issues.shibboleth.net/jira/browse/IDP-744

Modified:
    branches/3.1/idp-authn-api/src/main/java/net/shibboleth/idp/authn/ExternalAuthentication.java

Modified: branches/3.1/idp-authn-api/src/main/java/net/shibboleth/idp/authn/ExternalAuthentication.java
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.1/idp-authn-api/src/main/java/net/shibboleth/idp/authn/ExternalAuthentication.java?rev=7585&r1=7584&r2=7585&view=diff
==============================================================================
--- branches/3.1/idp-authn-api/src/main/java/net/shibboleth/idp/authn/ExternalAuthentication.java	(original)
+++ branches/3.1/idp-authn-api/src/main/java/net/shibboleth/idp/authn/ExternalAuthentication.java	Mon Jun 22 07:10:56 2015
@@ -80,7 +80,7 @@
     @Nonnull @NotEmpty public static String startExternalAuthentication(@Nonnull final HttpServletRequest request)
             throws ExternalAuthenticationException {
         final String conv = request.getParameter(CONVERSATION_KEY);
-        if (conv == null) {
+        if (conv == null || conv.isEmpty()) {
             throw new ExternalAuthenticationException("No conversation key found in request");
         }