svn commit: r1157353 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java

[mcucchiara]

Author: mcucchiara
Date: Sat Aug 13 09:04:19 2011
New Revision: 1157353

URL: http://svn.apache.org/viewvc?rev=1157353&view=rev
Log:
dynamic attributes became again a map of String (see http://s.apache.org/dyn)

Modified:
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java?rev=1157353&r1=1157352&r2=1157353&view=diff
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
 Sat Aug 13 09:04:19 2011
@@ -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 exte
 
     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);
-        }
-    }
-
 }