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

[noreply at shibboleth.net]

Author: scantor
Date: Fri Oct  9 11:50:48 2015
New Revision: 7801

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7801&view=rev
Log:
Relax method signature.

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

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/PreserveAuthenticationFlowState.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/PreserveAuthenticationFlowState.java?rev=7801&r1=7800&r2=7801&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/PreserveAuthenticationFlowState.java	(original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/PreserveAuthenticationFlowState.java	Fri Oct  9 11:50:48 2015
@@ -24,12 +24,12 @@
 import java.util.Map;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import net.shibboleth.idp.authn.AbstractAuthenticationAction;
 import net.shibboleth.idp.authn.context.AuthenticationContext;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.profile.context.ProfileRequestContext;
@@ -65,11 +65,14 @@
      * 
      * @param names parameter names
      */
-    public void setParameterNames(@Nonnull @NonnullElements final Collection<String> names) {
+    public void setParameterNames(@Nullable @NonnullElements final Collection<String> names) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
-        Constraint.isNotNull(names, "Parameter name collection cannot be null");
         
-        parameterNames = new ArrayList<>(StringSupport.normalizeStringCollection(names));
+        if (names == null) {
+            parameterNames = Collections.emptyList();
+        } else {
+            parameterNames = new ArrayList<>(StringSupport.normalizeStringCollection(names));
+        }
     }