Merge pull request #643 from Vlatombe/JENKINS-16069

[JENKINS-16069] Remove wrapping of JSON with ( ) Thanks !
jenkinsci · Dec 7, 2012 · 09fc9f3 · 09fc9f3
2 parents 87e2135 + b6ce038
commit 09fc9f3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/changelog.html b/changelog.html
@@ -71,6 +71,9 @@
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-1295">issue 1295</a>)
   <li class=bug>
     Context menu and tooltip of the queue items were colliding with each other
+    <li class=bug>
+    Fix combobox ui component
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-16069">issue 16069</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 

diff --git a/core/src/main/java/hudson/util/ComboBoxModel.java b/core/src/main/java/hudson/util/ComboBoxModel.java
@@ -62,8 +62,6 @@ public ComboBoxModel(String... values) {
     public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
         rsp.setContentType(Flavor.JSON.contentType);
         PrintWriter w = rsp.getWriter();
-        w.print('(');
         JSONArray.fromObject(this).write(w);
-        w.print(')');
     }
 }