From: Henri Sara <henri.sara@itmill.com>
Date: Tue, 27 Sep 2011 09:44:51 +0000 (+0000)
Subject: #7672 Fixed null handling in escaping for HTML.
X-Git-Tag: 6.7.0.rc1~11^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0fe9cb001c7abf3d52a3ce008c2e9f7e678a5e90;p=vaadin-framework.git

#7672 Fixed null handling in escaping for HTML.

svn changeset:21333/svn branch:6.6
---

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++) {