Author: remy.maucherat(a)jboss.com Date: 2009-06-10 08:42:02 -0400 (Wed, 10 Jun 2009) New Revision: 1099 Modified: branches/2.1.x/java/org/apache/jasper/compiler/Parser.java Log: - Fix the include fix. 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-10 12:41:52 UTC (rev 1098) +++ branches/2.1.x/java/org/apache/jasper/compiler/Parser.java 2009-06-10 12:42:02 UTC (rev 1099) @@ -125,21 +125,22 @@ // For the Top level page, add include-prelude and include-coda PageInfo pageInfo = pc.getCompiler().getPageInfo(); - if (parent == null) { + if (parent == null && !isTagFile) { parser.addInclude(root, pageInfo.getIncludePrelude()); } if (directivesOnly) { - parser.parseTagFileDirectives(root); + parser.parseFileDirectives(root); } else { while (reader.hasMoreInput()) { parser.parseElements(root); } } - if (parent == null) { + if (parent == null && !isTagFile) { parser.addInclude(root, pageInfo.getIncludeCoda()); } - return new Node.Nodes(root); + Node.Nodes page = new Node.Nodes(root); + return page; } /** @@ -1770,7 +1771,7 @@ return JAVAX_BODY_CONTENT_TEMPLATE_TEXT; } - private void parseTagFileDirectives(Node parent) throws JasperException { + private void parseFileDirectives(Node parent) throws JasperException { reader.setSingleFile(true); reader.skipUntil("<"); while (reader.hasMoreInput()) {