Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47413

First part of a composite expression "${a}${b}" was not coerced to String

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@795466 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index b6539b1..504a772 100644 (file)
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -862,6 +862,10 @@ class Generator {
                         // Composite expression - must coerce to String
                         type = String.class;
                     }
+                    if (i+1 < size) {
+                        // Composite expression - must coerce to String
+                        type = String.class;
+                    }
                     output.append(
                             JspUtil.interpreterCall(isTag,
                                     tx.substring(mark, i+1), type,