From 106d95a79f86f81d16ea66a8ea1a33aea9e85773 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Tue, 28 Sep 2010 21:11:09 +0000 Subject: [PATCH] Prototype.js calls eval() on the response when the content type is set to JavaScript, and eval() fails without the surrounding bracket. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@35344 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/util/ComboBoxModel.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/util/ComboBoxModel.java b/core/src/main/java/hudson/util/ComboBoxModel.java index 3a916293ad..60e7ccda0c 100644 --- a/core/src/main/java/hudson/util/ComboBoxModel.java +++ b/core/src/main/java/hudson/util/ComboBoxModel.java @@ -31,6 +31,7 @@ import org.kohsuke.stapler.export.Flavor; import javax.servlet.ServletException; import java.io.IOException; +import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collection; @@ -59,6 +60,9 @@ public class ComboBoxModel extends ArrayList implements HttpResponse { public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException { rsp.setContentType(Flavor.JSON.contentType); - JSONArray.fromObject(this).write(rsp.getWriter()); + PrintWriter w = rsp.getWriter(); + w.print('('); + JSONArray.fromObject(this).write(w); + w.print(')'); } }