From: Artur Signell <artur.signell@itmill.com>
Date: Mon, 1 Mar 2010 17:31:16 +0000 (+0000)
Subject: #3734 - Widgetset fails to load when customized system messages contain special chara... 
X-Git-Tag: 6.7.0.beta1~2008
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f0c6a51e3b2ecf62226621ab630069f28862b352;p=vaadin-framework.git

#3734 - Widgetset fails to load when customized system messages contain special characters

svn changeset:11572/svn branch:6.3
---

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index 0fd4e46f8c..77e83838c5 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -604,7 +604,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
         }
 
         if (caption != null) {
-            caption = "\"" + caption + "\"";
+            caption = "\"" + JsonPaintTarget.escapeJSON(caption) + "\"";
         }
         if (details != null) {
             if (message == null) {
@@ -613,11 +613,12 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
                 message += "<br/><br/>" + details;
             }
         }
+
         if (message != null) {
-            message = "\"" + message + "\"";
+            message = "\"" + JsonPaintTarget.escapeJSON(message) + "\"";
         }
         if (url != null) {
-            url = "\"" + url + "\"";
+            url = "\"" + JsonPaintTarget.escapeJSON(url) + "\"";
         }
 
         // Set the response type