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

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 0fd4e46f8c2ec9fa12144918ff7d85f5eb12fca5..77e83838c52e31f1359d9fd07661ee45d3c13c06 100644 (file)
--- 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