From 1253cb074bedf2f1e820186870749bbcc7219aa6 Mon Sep 17 00:00:00 2001 From: Maurizio Cucchiara Date: Fri, 14 Oct 2011 09:24:28 +0000 Subject: [PATCH] WW-3693 - Javatemplate engine ignores escape parameter of action message tag git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1183256 13f79535-47bb-0310-9956-ffa450edef68 --- .../struts2/views/java/simple/AbstractMessageListHandler.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AbstractMessageListHandler.java b/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AbstractMessageListHandler.java index 5a8a8e9f4..416824631 100644 --- a/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AbstractMessageListHandler.java +++ b/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AbstractMessageListHandler.java @@ -20,6 +20,7 @@ */ package org.apache.struts2.views.java.simple; +import org.apache.commons.lang.BooleanUtils; import org.apache.struts2.util.MakeIterator; import org.apache.struts2.views.java.Attributes; import org.apache.struts2.views.java.TagGenerator; @@ -39,6 +40,7 @@ public abstract class AbstractMessageListHandler extends AbstractTagHandler impl if (errorsObj != null) { Iterator itt = MakeIterator.convert(errorsObj); if (itt.hasNext()) { + boolean escape = BooleanUtils.toBooleanDefaultIfNull((Boolean) params.get("escape"), false); Attributes attrs = new Attributes(); attrs.addIfExists("style", params.get("cssStyle")) .add("class", params.containsKey("cssClass") ? (String) params.get("cssClass") : getDefaultClass()); @@ -51,7 +53,7 @@ public abstract class AbstractMessageListHandler extends AbstractTagHandler impl //span for error start("span", null); - characters(error); + characters(error, escape); end("span"); end("li");