Author: remy.maucherat(a)jboss.com Date: 2009-08-17 11:53:51 -0400 (Mon, 17 Aug 2009) New Revision: 1143 Modified: trunk/java/org/apache/jasper/compiler/JspUtil.java trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java trunk/webapps/docs/changelog.xml Log: - Port two small Jasper patches. Modified: trunk/java/org/apache/jasper/compiler/JspUtil.java =================================================================== --- trunk/java/org/apache/jasper/compiler/JspUtil.java 2009-08-17 12:48:31 UTC (rev 1142) +++ trunk/java/org/apache/jasper/compiler/JspUtil.java 2009-08-17 15:53:51 UTC (rev 1143) @@ -506,7 +506,7 @@ * or, if it's a primitive, the name of its correspondent boxed * type. */ - String targetType = expectedType.getName(); + String targetType = getCanonicalName(expectedType); String primitiveConverterMethod = null; if (expectedType.isPrimitive()) { if (expectedType.equals(Boolean.TYPE)) { Modified: trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java =================================================================== --- trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java 2009-08-17 12:48:31 UTC (rev 1142) +++ trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java 2009-08-17 15:53:51 UTC (rev 1143) @@ -68,7 +68,7 @@ public void visit(Node.CustomTag n) throws JasperException { setScriptingVars(n, VariableInfo.AT_BEGIN); setScriptingVars(n, VariableInfo.NESTED); - visitBody(n); + new ScriptingVariableVisitor(err).visitBody(n); setScriptingVars(n, VariableInfo.AT_END); } Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2009-08-17 12:48:31 UTC (rev 1142) +++ trunk/webapps/docs/changelog.xml 2009-08-17 15:53:51 UTC (rev 1143) @@ -174,6 +174,13 @@ <fix> <bug>47413</bug>: First part of a composite expression "${a}${b}" was not coerced to String. (kkolinko) </fix> + <fix> + <bug>41824</bug>: Need to use canonical rather than binary form when writing code. (markt) + </fix> + <fix> + <bug>42390</bug>: Correct JSP compilation error with nested tagfile tags with variables with "AT_BEGIN" scope. + Patch provided by Konstantin Kolinko. (markt) + </fix> </changelog> </subsection> </section>