Trim trailing whitespace in resourcenames

If not trimmed, the trailing whitespaces will find their way to the jobs config.xml, causing confusion. Trailing whitespaces in resourcenames are caused also by the autocompletion script, that suggests resourcenames. JIRA Issue: https://issues.jenkins-ci.org/browse/JENKINS-47235
jenkinsci · Oct 10, 2017 · 300d4b1 · 300d4b1
1 parent 3a9e649
commit 300d4b1
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/org/jenkins/plugins/lockableresources/RequiredResourcesProperty.java b/src/main/java/org/jenkins/plugins/lockableresources/RequiredResourcesProperty.java
@@ -43,7 +43,11 @@ public RequiredResourcesProperty(String resourceNames,
 			String resourceNamesVar, String resourceNumber,
 			String labelName, @CheckForNull SecureGroovyScript resourceMatchScript) {
 		super();
-		this.resourceNames = resourceNames;
+		if (resourceNames != null) {
+			this.resourceNames = resourceNames.trim();
+		} else {
+			this.resourceNames = null;
+		}
 		this.resourceNamesVar = resourceNamesVar;
 		this.resourceNumber = resourceNumber;
 		if (resourceMatchScript != null) {