[JENKINS-16069] Remove wrapping of JSON with ( )

now it is done properly on Javascript side so the current server implementation triggers javascript errors. Result can be observed on DynamicComboBox within ui-samples-plugin(cherry picked from commit b6ce038) Conflicts: changelog.html
jenkinsci · Jan 24, 2013 · 580e7de · 580e7de
1 parent 8734bb7
commit 580e7de
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 24 deletions.
diff --git a/changelog.html b/changelog.html
@@ -56,28 +56,8 @@
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
   <li class=bug>
-    Displaying <code>/people</code> can consume huge resources.
-    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15206">issue 15206</a>)
-  <li class=bug>
-    <code>FilePath.validateAntFileMask</code> too slow for <code>/configure</code>.
-    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-7214">issue 7214</a>)
-  <li class=bug>
-    Log recorders do not work reliably.
-    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15226">issue 15226</a>)
-  <li class=bug>
-    Memory exhaustion parsing large test stdio from Surefire.
-    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15382">issue 15382</a>)
-  <li class='rfe'>
-    Memory footprint improvement, especially under large HTTP request threads.
-  <li class=bug>
-    JDK installation failed on some slaves with <code>InvalidClassException: hudson.tools.JDKInstaller$Platform$1; local class incompatible: …</code>
-    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-14667">issue 14667</a>)
-  <li class=bug>
-    Check view permissions before showing config page
-    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15277">issue 15277</a>)
-  <li class=bug>
-    Invalid JSON gets produced with duplicate keys (seen on change sets)
-    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-13336">issue 13336</a>)
+    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(')');
     }
 }