Fix https://java.net/jira/browse/JSP-39

Kin Man Chung · Kin Man Chung · commit 1a22123b4079 · 2014-02-24T22:52:59.000Z
svn path=/trunk/; revision=1462
diff --git a/impl/src/main/java/org/apache/jasper/compiler/JspUtil.java b/impl/src/main/java/org/apache/jasper/compiler/JspUtil.java
@@ -581,40 +581,41 @@ public static String interpreterCall(boolean isTagFile,
 	 * or, if it's a primitive, the name of its correspondent boxed
 	 * type.
          */
-	String targetType = expectedType.getName();
+        String returnType = expectedType.getName();
+        String targetType = returnType;
 	String primitiveConverterMethod = null;
 	if (expectedType.isPrimitive()) {
 	    if (expectedType.equals(Boolean.TYPE)) {
-		targetType = Boolean.class.getName();
+		returnType = Boolean.class.getName();
 		primitiveConverterMethod = "booleanValue";
 	    } else if (expectedType.equals(Byte.TYPE)) {
-		targetType = Byte.class.getName();
+		returnType = Byte.class.getName();
 		primitiveConverterMethod = "byteValue";
 	    } else if (expectedType.equals(Character.TYPE)) {
-		targetType = Character.class.getName();
+		returnType = Character.class.getName();
 		primitiveConverterMethod = "charValue";
 	    } else if (expectedType.equals(Short.TYPE)) {
-		targetType = Short.class.getName();
+		returnType = Short.class.getName();
 		primitiveConverterMethod = "shortValue";
 	    } else if (expectedType.equals(Integer.TYPE)) {
-		targetType = Integer.class.getName();
+		returnType = Integer.class.getName();
 		primitiveConverterMethod = "intValue";
 	    } else if (expectedType.equals(Long.TYPE)) {
-		targetType = Long.class.getName();
+		returnType = Long.class.getName();
 		primitiveConverterMethod = "longValue";
 	    } else if (expectedType.equals(Float.TYPE)) {
-		targetType = Float.class.getName();
+		returnType = Float.class.getName();
 		primitiveConverterMethod = "floatValue";
 	    } else if (expectedType.equals(Double.TYPE)) { 
-		targetType = Double.class.getName();
+		returnType = Double.class.getName();
 		primitiveConverterMethod = "doubleValue";
 	    }
 	}
  
 	targetType = toJavaSourceType(targetType);
 
 	StringBuilder call = new StringBuilder(
-             "(" + targetType + ") "
+             "(" + returnType + ") "
                + "org.apache.jasper.runtime.PageContextImpl.evaluateExpression"
                + "(" + Generator.quote(expression) + ", "
                +       targetType + ".class, "
