Author: lukaszlenart Date: Mon Mar 4 11:17:47 2013 New Revision: 1452255 URL: http://svn.apache.org/r1452255 Log: WW-3990 Returns null when trying to escape null value instead of returning an empty string
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java?rev=1452255&r1=1452254&r2=1452255&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java Mon Mar 4 11:17:47 2013 @@ -881,7 +881,7 @@ public abstract class UIBean extends Com if (name != null) { return name.replaceAll("[\\/\\.\\[\\]]", "_"); } else { - return ""; + return null; } } @@ -895,7 +895,7 @@ public abstract class UIBean extends Com if (val != null) { return val.replaceAll("\"", """); } else { - return ""; + return null; } }