Author: markt
Date: Wed Jan 14 15:22:25 2009
New Revision: 734552
URL: http://svn.apache.org/viewvc?rev=734552&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42693
Fix compilation of recursive tags
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 14 15:22:25 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710125,710205,711126,711600,712461,718360,719602,719626,719628,720069,723404,723738,726052,727303,728032,728947,729057,730250
+/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,718360,719602,719626,719628,720046,720069,723404,723738,726052,727303,728032,728947,729057,730250,732859
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=734552&r1=734551&r2=734552&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 14 15:22:25 2009
@@ -130,12 +130,6 @@
+1: fhanik, funkman, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42693
- Fix compilation of recursive tags
- http://svn.apache.org/viewvc?rev=720046&view=rev
- +1: markt, fhanik, funkman
- -1:
-
* Use consistent (and more useful) JPDA defaults in catalina.bat
http://svn.apache.org/viewvc?rev=721040&view=rev
+1: markt, fhanik, funkman
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java?rev=734552&r1=734551&r2=734552&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java Wed Jan
14 15:22:25 2009
@@ -334,7 +334,7 @@
generateClass(smap);
}
} finally {
- if (tfp != null) {
+ if (tfp != null && ctxt.isPrototypeMode()) {
tfp.removeProtoTypeFiles(null);
}
// Make sure these object which are only used during the
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=734552&r1=734551&r2=734552&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 14 15:22:25 2009
@@ -299,6 +299,10 @@
FeatureDescriptors. Patch provided by Mathias Broekelmann. (markt)
</fix>
<fix>
+ <bug>42693</bug>: Fix JSP generation error with recursive tag file
+ structure. (markt)
+ </fix>
+ <fix>
<bug>45427</bug>: Correctly handle unmatched quotes in EL expressions.
(markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
