Author: remy.maucherat(a)jboss.com Date: 2009-06-08 09:15:38 -0400 (Mon, 08 Jun 2009) New Revision: 1093 Modified: branches/2.1.x/java/org/apache/jasper/compiler/Parser.java branches/2.1.x/webapps/docs/changelog.xml Log: - Port include processing fix from Jasper. Modified: branches/2.1.x/java/org/apache/jasper/compiler/Parser.java =================================================================== --- branches/2.1.x/java/org/apache/jasper/compiler/Parser.java 2009-06-08 11:30:55 UTC (rev 1092) +++ branches/2.1.x/java/org/apache/jasper/compiler/Parser.java 2009-06-08 13:15:38 UTC (rev 1093) @@ -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: branches/2.1.x/webapps/docs/changelog.xml =================================================================== --- branches/2.1.x/webapps/docs/changelog.xml 2009-06-08 11:30:55 UTC (rev 1092) +++ branches/2.1.x/webapps/docs/changelog.xml 2009-06-08 13:15:38 UTC (rev 1093) @@ -24,6 +24,31 @@ <subsection name="Catalina"> <changelog> <fix> + Don't use XML parser from webapp to process TLD files. (markt, jclere) + </fix> + </changelog> + </subsection> + <subsection name="Coyote"> + <changelog> + </changelog> + </subsection> + <subsection name="Jasper"> + <changelog> + <fix> + <bug>47318</bug>: Process include preludes and codas when processing directives and whole pages. (markt) + </fix> + </changelog> + </subsection> +</section> + +<section name="JBoss Web 2.1.3.GA (remm)"> + <subsection name="General"> + <changelog> + </changelog> + </subsection> + <subsection name="Catalina"> + <changelog> + <fix> NPE in various realms. (markt) </fix> <fix>