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
This commit is contained in:
Maurizio Cucchiara
2011-08-13 09:04:19 +00:00
parent b4265d369d
commit 8a9fa85766
@@ -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);
}
}
}