From 95fa53c44c0e6a8ed5dec28b594c6c33c418840c Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Tue, 28 Feb 2012 14:57:54 -0800
Subject: [PATCH] Adjusted the error handling responsibility.

So that parameter definitions can define optional parameters.
---
 core/src/main/java/hudson/model/FileParameterDefinition.java   | 2 +-
 core/src/main/java/hudson/model/ParameterDefinition.java       | 3 +++
 .../main/java/hudson/model/ParametersDefinitionProperty.java   | 2 --
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/hudson/model/FileParameterDefinition.java b/core/src/main/java/hudson/model/FileParameterDefinition.java
index 2529c12e84..5cc3f78b3a 100644
--- a/core/src/main/java/hudson/model/FileParameterDefinition.java
+++ b/core/src/main/java/hudson/model/FileParameterDefinition.java
@@ -96,7 +96,7 @@ public class FileParameterDefinition extends ParameterDefinition {
     public ParameterValue createValue(CLICommand command, String value) throws IOException, InterruptedException {
         // capture the file to the server
         FilePath src = new FilePath(command.checkChannel(),value);
-        File local = File.createTempFile("hudson","parameter");
+        File local = File.createTempFile("jenkins","parameter");
         src.copyTo(new FilePath(local));
 
         FileParameterValue p = new FileParameterValue(getName(), local, src.getName());
diff --git a/core/src/main/java/hudson/model/ParameterDefinition.java b/core/src/main/java/hudson/model/ParameterDefinition.java
index 81e04e686d..7b71927619 100644
--- a/core/src/main/java/hudson/model/ParameterDefinition.java
+++ b/core/src/main/java/hudson/model/ParameterDefinition.java
@@ -165,6 +165,9 @@ public abstract class ParameterDefinition implements
      * <p>
      * If a {@link ParameterDefinition} can't really support this mode of creating a value,
      * you may just always return null.
+     *
+     * @throws IllegalStateException
+     *      If the parameter is deemed required but was missing in the submission.
      */
     public abstract ParameterValue createValue(StaplerRequest req);
 
diff --git a/core/src/main/java/hudson/model/ParametersDefinitionProperty.java b/core/src/main/java/hudson/model/ParametersDefinitionProperty.java
index f2894e08ec..8a8abff77e 100644
--- a/core/src/main/java/hudson/model/ParametersDefinitionProperty.java
+++ b/core/src/main/java/hudson/model/ParametersDefinitionProperty.java
@@ -141,8 +141,6 @@ public class ParametersDefinitionProperty extends JobProperty<AbstractProject<?,
         	ParameterValue value = d.createValue(req);
         	if (value != null) {
         		values.add(value);
-        	} else if ((value == null) && !(d instanceof FileParameterDefinition)) {
-        	    throw new IllegalArgumentException("Parameter " + d.getName() + " was missing.");
         	}
         }
 
-- 
GitLab