From e38dc2bee40bcc2a01619fa59d3fd4614bdcaad6 Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 5 Jun 2009 23:35:14 +0000 Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47318 Process include preludes and codas when processing directives and whole pages. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@782166 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/jasper/compiler/Parser.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/java/org/apache/jasper/compiler/Parser.java b/java/org/apache/jasper/compiler/Parser.java index 87a29dc39..30dd994ae 100644 --- a/java/org/apache/jasper/compiler/Parser.java +++ b/java/org/apache/jasper/compiler/Parser.java @@ -124,25 +124,24 @@ class Parser implements TagConstants { 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); } /** -- 2.11.0