From 8a9fa857662da1c86ef9c1669922e6f6f34357e2 Mon Sep 17 00:00:00 2001 From: Maurizio Cucchiara Date: Sat, 13 Aug 2011 09:04:19 +0000 Subject: [PATCH] dynamic attributes became again a map of String (see http://s.apache.org/dyn) git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1157353 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/struts2/views/jsp/ui/AbstractUITag.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java index 5e1022050..f33f3f90a 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java @@ -21,6 +21,7 @@ package org.apache.struts2.views.jsp.ui; +import org.apache.commons.lang.ObjectUtils; import org.apache.struts2.components.UIBean; import org.apache.struts2.views.jsp.ComponentTagSupport; @@ -291,19 +292,9 @@ public abstract class AbstractUITag extends ComponentTagSupport implements Dynam public void setDynamicAttribute(String uri, String localName, Object value) throws JspException { if (value != null && value instanceof String) { - evaluateValue(localName, value); + dynamicAttributes.put(localName, String.valueOf(ObjectUtils.defaultIfNull(findValue(value.toString()), value))); } else { dynamicAttributes.put(localName, value); } } - - private void evaluateValue(String localName, Object value) { - Object evaluatedValue = findValue(value.toString()); - if (evaluatedValue != null) { - dynamicAttributes.put(localName, evaluatedValue); - } else { - dynamicAttributes.put(localName, value); - } - } - }