Author: remy.maucherat(a)jboss.com
Date: 2010-11-25 05:43:58 -0500 (Thu, 25 Nov 2010)
New Revision: 1589
Modified:
trunk/java/org/apache/el/parser/AstCompositeExpression.java
trunk/webapps/docs/changelog.xml
Log:
- Minor EL fix for enums.
Modified: trunk/java/org/apache/el/parser/AstCompositeExpression.java
===================================================================
--- trunk/java/org/apache/el/parser/AstCompositeExpression.java 2010-11-25 10:25:23 UTC
(rev 1588)
+++ trunk/java/org/apache/el/parser/AstCompositeExpression.java 2010-11-25 10:43:58 UTC
(rev 1589)
@@ -20,6 +20,7 @@
import javax.el.ELException;
+import org.apache.el.lang.ELSupport;
import org.apache.el.lang.EvaluationContext;
@@ -46,7 +47,7 @@
for (int i = 0; i < this.children.length; i++) {
obj = this.children[i].getValue(ctx);
if (obj != null) {
- sb.append(obj);
+ sb.append(ELSupport.coerceToString(obj));
}
}
}
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2010-11-25 10:25:23 UTC (rev 1588)
+++ trunk/webapps/docs/changelog.xml 2010-11-25 10:43:58 UTC (rev 1589)
@@ -61,6 +61,9 @@
<bug>50066</bug>: Fix building of recursive tag files when the file
depends on a JAR file.
Patch provided by Sylvain Laurent. (markt)
</fix>
+ <fix>
+ <bug>50105</bug>: Use Enum.name() rather than Enum.toString() in
composite expressions. (markt)
+ </fix>
</changelog>
</subsection>
</section>