diff options
author | Henri Sara <henri.sara@itmill.com> | 2011-09-27 09:44:51 +0000 |
---|---|---|
committer | Henri Sara <henri.sara@itmill.com> | 2011-09-27 09:44:51 +0000 |
commit | 0fe9cb001c7abf3d52a3ce008c2e9f7e678a5e90 (patch) | |
tree | e3db7e314baa3fdfc92a84c09c37c7b3ceb479f5 /src | |
parent | c49bd62b42c8c0c658321589b391d7975e435efa (diff) | |
download | vaadin-framework-0fe9cb001c7abf3d52a3ce008c2e9f7e678a5e90.tar.gz vaadin-framework-0fe9cb001c7abf3d52a3ce008c2e9f7e678a5e90.zip |
#7672 Fixed null handling in escaping for HTML.
svn changeset:21333/svn branch:6.6
Diffstat (limited to 'src')
-rw-r--r-- | src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java index 5bbfbfbbc2..526e85a8d8 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java @@ -2456,6 +2456,9 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements * @return a safe string to be added inside an html tag */ public static final String safeEscapeForHtml(String unsafe) { + if (null == unsafe) { + return null; + } StringBuilder safe = new StringBuilder(); char[] charArray = unsafe.toCharArray(); for (int i = 0; i < charArray.length; i++) { |