From d89ac943b4ceef233f6906769a64318e10f3144d Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Mon, 4 Mar 2013 11:17:47 +0000
Subject: [PATCH] WW-3990 Returns null when trying to escape null value instead
 of returning an empty string

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1452255 13f79535-47bb-0310-9956-ffa450edef68
---
 core/src/main/java/org/apache/struts2/components/UIBean.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/apache/struts2/components/UIBean.java b/core/src/main/java/org/apache/struts2/components/UIBean.java
index 88b77c107..a957244c7 100644
--- a/core/src/main/java/org/apache/struts2/components/UIBean.java
+++ b/core/src/main/java/org/apache/struts2/components/UIBean.java
@@ -881,7 +881,7 @@ public abstract class UIBean extends Component {
         if (name != null) {
             return name.replaceAll("[\\/\\.\\[\\]]", "_");
         } else {
-            return "";
+            return null;
         }
     }
 
@@ -895,7 +895,7 @@ public abstract class UIBean extends Component {
         if (val != null) {
             return val.replaceAll("\"", "&#34;");
         } else {
-            return "";
+            return null;
         }
     }