diff options
| -rw-r--r-- | src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java index d30c0920f3..068cf2e1fa 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java @@ -788,10 +788,7 @@ public abstract class AbstractCommunicationManager implements return; } - // Sets the response type - response.setContentType("application/json; charset=UTF-8"); - // some dirt to prevent cross site scripting - openJsonMessage(outWriter); + openJsonMessage(outWriter, response); // security key Object writeSecurityTokenFlag = request @@ -1786,10 +1783,9 @@ public abstract class AbstractCommunicationManager implements // client that application has quit and where to point browser now // Set the response type final OutputStream out = response.getOutputStream(); - response.setContentType("application/json; charset=UTF-8"); final PrintWriter outWriter = new PrintWriter(new BufferedWriter( new OutputStreamWriter(out, "UTF-8"))); - openJsonMessage(outWriter); + openJsonMessage(outWriter, response); outWriter.print("\"redirect\":{"); outWriter.write("\"url\":\"" + logoutUrl + "\"}"); closeJsonMessage(outWriter); @@ -1806,8 +1802,12 @@ public abstract class AbstractCommunicationManager implements * Writes the opening of JSON message to be sent to client. * * @param outWriter + * @param response */ - protected void openJsonMessage(PrintWriter outWriter) { + protected void openJsonMessage(PrintWriter outWriter, Response response) { + // Sets the response type + response.setContentType("application/json; charset=UTF-8"); + // some dirt to prevent cross site scripting outWriter.print("for(;;);[{"); } |