Author: remm
Date: Tue Jan 2 14:54:04 2018
New Revision: 1819844
URL: http://svn.apache.org/viewvc?rev=1819844&view=rev
Log:
61945: Remove recursion when using prototype mode.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java?rev=1819844&r1=1819843&r2=1819844&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java Tue Jan 2
14:54:04 2018
@@ -215,6 +215,7 @@ public abstract class Compiler {
// generate prototype .java file for the tag file
try (ServletWriter writer = setupContextWriter(javaFileName)) {
Generator.generate(writer, this, pageNodes);
+ return null;
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1819844&r1=1819843&r2=1819844&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jan 2 14:54:04 2018
@@ -97,6 +97,9 @@
particular, the calling of a varargs method with no parameters now
works
correctly. Based on a patch by Nitkalya (Ing) Wiriyanuparb. (markt)
</fix>
+ <fix>
+ <bug>61945</bug>: Fix prototype mode used to compile tags. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
