From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 10 Jun 2009 12:15:42 +0000 (+0000)
Subject: Revert r782166 as it introduced a regression of its own.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=84f58d329a8434b82439f8cf3dbb6af954aec10c;p=tomcat7.0

Revert r782166 as it introduced a regression of its own.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@783313 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/jasper/compiler/Parser.java b/java/org/apache/jasper/compiler/Parser.java
index 30dd994ae..87a29dc39 100644
--- a/java/org/apache/jasper/compiler/Parser.java
+++ b/java/org/apache/jasper/compiler/Parser.java
@@ -124,24 +124,25 @@ 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 include-prelude and include-coda
+        // For the Top level page, add inlcude-prelude and include-coda
         PageInfo pageInfo = pc.getCompiler().getPageInfo();
         if (parent == null) {
             parser.addInclude(root, pageInfo.getIncludePrelude());
         }
-        if (directivesOnly) {
-            parser.parseTagFileDirectives(root);
-        } else {
-            while (reader.hasMoreInput()) {
-                parser.parseElements(root);
-            }
+        while (reader.hasMoreInput()) {
+            parser.parseElements(root);
         }
         if (parent == null) {
             parser.addInclude(root, pageInfo.getIncludeCoda());
         }
 
-        return new Node.Nodes(root);
+        Node.Nodes page = new Node.Nodes(root);
+        return page;
     }
 
     /**