JENKINS-10982 trim labels

jenkinsci · Sep 14, 2011 · cc111ac · cc111ac
1 parent a986785
commit cc111ac
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/main/java/org/jvnet/jenkins/plugins/nodelabelparameter/LabelParameterValue.java b/src/main/java/org/jvnet/jenkins/plugins/nodelabelparameter/LabelParameterValue.java
@@ -34,7 +34,9 @@ public LabelParameterValue(String name) {
 	@DataBoundConstructor
 	public LabelParameterValue(String name, String label) {
 		super(name);
-		this.label = label;
+		if(label != null){
+			this.label = label.trim();
+		}
 	}
 
 	/**
@@ -43,7 +45,9 @@ public LabelParameterValue(String name, String label) {
 	 */
 	public LabelParameterValue(String name, String description, String label) {
 		super(name, description);
-		this.label = label;
+		if(label != null){
+			this.label = label.trim();
+		}
 	}
 
 	@Override
@@ -77,7 +81,9 @@ public String getLabel() {
 	 *            the label to set
 	 */
 	public void setLabel(String label) {
-		this.label = label;
+		if(label != null){
+			this.label = label.trim();
+		}
 	}
 
 	/**

diff --git a/src/main/java/org/jvnet/jenkins/plugins/nodelabelparameter/NodeParameterValue.java b/src/main/java/org/jvnet/jenkins/plugins/nodelabelparameter/NodeParameterValue.java
@@ -35,12 +35,12 @@ public class NodeParameterValue extends LabelParameterValue {
 	public NodeParameterValue(String name, List<String> labels) {
 		super(name);
 		if (labels != null && !labels.isEmpty()) {
-			this.setLabel(labels.get(0));
+			this.setLabel(labels.get(0).trim());
 			if (labels.size() > 1) {
 				final List<String> subList = labels.subList(1, labels.size());
 				nextLabels = new ArrayList<String>();
 				for (String l : subList) {
-					nextLabels.add(l);
+					nextLabels.add(l.trim());
 				}
 			}
 		} else {