From 41f1fe665b6bdcb45dc7c53de76de7f6252576a4 Mon Sep 17 00:00:00 2001
From: Seiji Sogabe <s.sogabe@gmail.com>
Date: Sat, 24 Nov 2012 21:55:20 +0900
Subject: [PATCH] [FIXED JENKINS-15836] Slave's Name should be trimmed of
 spaces at the beginning and end of the Name on Save

---
 changelog.html                                   | 5 ++++-
 core/src/main/java/hudson/model/ComputerSet.java | 9 +++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/changelog.html b/changelog.html
index 366a00b52e..0188e131fb 100644
--- a/changelog.html
+++ b/changelog.html
@@ -55,7 +55,10 @@ Upcoming changes</a>
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
-  <li class=>
+  <li class=bug>
+    Slave's Name should be trimmed of spaces at the beginning and end of the Name on Save.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15836">issue 15836</a>)
+
 </ul>
 </div><!--=TRUNK-END=-->
 
diff --git a/core/src/main/java/hudson/model/ComputerSet.java b/core/src/main/java/hudson/model/ComputerSet.java
index 72632bedae..4cdeeac5dc 100644
--- a/core/src/main/java/hudson/model/ComputerSet.java
+++ b/core/src/main/java/hudson/model/ComputerSet.java
@@ -53,6 +53,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.sf.json.JSONObject;
 
 /**
  * Serves as the top of {@link Computer}s in the URL hierarchy.
@@ -262,9 +263,13 @@ public final class ComputerSet extends AbstractModelObject implements Describabl
                                            @QueryParameter String type ) throws IOException, ServletException, FormException {
         final Jenkins app = Jenkins.getInstance();
         app.checkPermission(Computer.CREATE);
-        checkName(name);
+        String fixedName = Util.fixEmptyAndTrim(name);
+        checkName(fixedName);
 
-        Node result = NodeDescriptor.all().find(type).newInstance(req, req.getSubmittedForm());
+        JSONObject formData = req.getSubmittedForm();
+        formData.put("name", fixedName);
+        
+        Node result = NodeDescriptor.all().find(type).newInstance(req, formData);
         app.addNode(result);
 
         // take the user back to the slave list top page
-- 
GitLab