Author: remy.maucherat(a)jboss.com
Date: 2009-01-02 11:35:04 -0500 (Fri, 02 Jan 2009)
New Revision: 893
Modified:
trunk/java/org/apache/jasper/compiler/Generator.java
trunk/webapps/docs/changelog.xml
Log:
- Ok, so I don't know why, but I can feel TCK trouble.
Modified: trunk/java/org/apache/jasper/compiler/Generator.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/Generator.java 2009-01-02 16:29:58 UTC (rev
892)
+++ trunk/java/org/apache/jasper/compiler/Generator.java 2009-01-02 16:35:04 UTC (rev
893)
@@ -834,6 +834,7 @@
private String attributeValueWithEL(boolean isTag, String tx,
Class<?> expectedType, String mapName) {
if (tx==null) return null;
+ Class<?> type = expectedType;
int size = tx.length();
StringBuffer output = new StringBuffer(size);
boolean el = false;
@@ -849,6 +850,8 @@
if (mark < i) {
if (output.length() > 0) {
output.append(" + ");
+ // Composite expression - must coerce to String
+ type = String.class;
}
output.append(quote(tx.substring(mark, i)));
}
@@ -863,10 +866,12 @@
// End of an EL expression
if (output.length() > 0) {
output.append(" + ");
+ // Composite expression - must coerce to String
+ type = String.class;
}
output.append(
JspUtil.interpreterCall(isTag,
- tx.substring(mark, i+1), expectedType,
+ tx.substring(mark, i+1), type,
mapName, false));
mark = i + 1;
el = false;
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2009-01-02 16:29:58 UTC (rev 892)
+++ trunk/webapps/docs/changelog.xml 2009-01-02 16:35:04 UTC (rev 893)
@@ -115,6 +115,9 @@
<fix>
<bug>46462</bug>: Compatibility with ASF projects which use JSP.
(markt)
</fix>
+ <fix>
+ <bug>46381</bug>: Coerce EL to String rather than Object when
concatenating. (markt)
+ </fix>
</changelog>
</subsection>
</section>
Show replies by date