diff options
| author | Artur Signell <artur.signell@itmill.com> | 2010-03-01 17:31:16 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2010-03-01 17:31:16 +0000 |
| commit | f0c6a51e3b2ecf62226621ab630069f28862b352 (patch) | |
| tree | d56d3d8b607001fe716e195dfc1cd018d7392379 | |
| parent | 4ac442c4ff3763b087812e3d290388b28d886300 (diff) | |
| download | vaadin-framework-f0c6a51e3b2ecf62226621ab630069f28862b352.tar.gz vaadin-framework-f0c6a51e3b2ecf62226621ab630069f28862b352.zip | |
#3734 - Widgetset fails to load when customized system messages contain special characters
svn changeset:11572/svn branch:6.3
| -rw-r--r-- | src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java | 7 |
1 files changed, 4 insertions, 3 deletions
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 |