#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 5bbfbfbbc2af9addadead6bd08497d35b90af061..526e85a8d8ea17202512fb7482f9fd1adf9255cd 100644 (file)
--- 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++) {