Author: remy.maucherat(a)jboss.com
Date: 2009-12-02 05:32:09 -0500 (Wed, 02 Dec 2009)
New Revision: 1311
Modified:
trunk/java/org/apache/jasper/compiler/JspUtil.java
trunk/webapps/docs/changelog.xml
Log:
- Port patch: add void type to JspUtil.
Modified: trunk/java/org/apache/jasper/compiler/JspUtil.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/JspUtil.java 2009-11-30 16:43:48 UTC (rev 1310)
+++ trunk/java/org/apache/jasper/compiler/JspUtil.java 2009-12-02 10:32:09 UTC (rev 1311)
@@ -29,9 +29,7 @@
import javax.el.FunctionMapper;
import javax.servlet.jsp.el.ExpressionEvaluator;
-
import org.apache.el.ExpressionFactoryImpl;
-import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
import org.apache.jasper.JspCompilationContext;
import org.apache.jasper.el.ExpressionEvaluatorImpl;
@@ -465,6 +463,8 @@
c = float.class;
else if ("double".equals(type))
c = double.class;
+ else if ("void".equals(type))
+ c = void.class;
else if (type.indexOf('[') < 0)
c = loader.loadClass(type);
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2009-11-30 16:43:48 UTC (rev 1310)
+++ trunk/webapps/docs/changelog.xml 2009-12-02 10:32:09 UTC (rev 1311)
@@ -217,6 +217,9 @@
<bug>42390</bug>: Correct JSP compilation error with nested tagfile
tags with variables with "AT_BEGIN" scope.
Patch provided by Konstantin Kolinko. (markt)
</fix>
+ <fix>
+ <bug>47453</bug>: Handle void return types in JspUtil. Patch by Tim
Funk. (markt)
+ </fix>
</changelog>
</subsection>
</section>
Show replies by date