Author: remy.maucherat(a)jboss.com Date: 2009-06-08 09:16:03 -0400 (Mon, 08 Jun 2009) New Revision: 1094 Modified: trunk/ROADMAP.txt trunk/java/org/apache/jasper/compiler/Parser.java trunk/webapps/docs/changelog.xml Log: - Port include processing fix from Jasper. Modified: trunk/ROADMAP.txt =================================================================== --- trunk/ROADMAP.txt 2009-06-08 13:15:38 UTC (rev 1093) +++ trunk/ROADMAP.txt 2009-06-08 13:16:03 UTC (rev 1094) @@ -5,6 +5,7 @@ - Update digester XML parsing rules for web.xml updates (session tracking-mode, cookie-config, servlet enabled, servlets and filters async-supported, http-method-omission) - Enforce web.xml fragments merging rules +- Migrate relevant components to JAR repository (in paticular classloader) - Lazy webapp startup valve - Abstract JMX in custom modeler better - JSP 2.2 changes Modified: trunk/java/org/apache/jasper/compiler/Parser.java =================================================================== --- trunk/java/org/apache/jasper/compiler/Parser.java 2009-06-08 13:15:38 UTC (rev 1093) +++ trunk/java/org/apache/jasper/compiler/Parser.java 2009-06-08 13:16:03 UTC (rev 1094) @@ -123,25 +123,23 @@ root.setIsDefaultPageEncoding(isDefaultPageEncoding); root.setIsBomPresent(isBomPresent); - if (directivesOnly) { - parser.parseTagFileDirectives(root); - return new Node.Nodes(root); - } - - // For the Top level page, add inlcude-prelude and include-coda + // For the Top level page, add include-prelude and include-coda PageInfo pageInfo = pc.getCompiler().getPageInfo(); if (parent == null) { parser.addInclude(root, pageInfo.getIncludePrelude()); } - while (reader.hasMoreInput()) { - parser.parseElements(root); + if (directivesOnly) { + parser.parseTagFileDirectives(root); + } else { + while (reader.hasMoreInput()) { + parser.parseElements(root); + } } if (parent == null) { parser.addInclude(root, pageInfo.getIncludeCoda()); } - Node.Nodes page = new Node.Nodes(root); - return page; + return new Node.Nodes(root); } /** Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2009-06-08 13:15:38 UTC (rev 1093) +++ trunk/webapps/docs/changelog.xml 2009-06-08 13:16:03 UTC (rev 1094) @@ -125,6 +125,9 @@ <fix> Removed some casts in ELResolverImpl. Patch suggested by kkolinko. (markt) </fix> + <fix> + <bug>47318</bug>: Process include preludes and codas when processing directives and whole pages. (markt) + </fix> </changelog> </subsection> </section>