Author: markt
Date: Wed Jun 10 12:15:42 2009
New Revision: 783313
URL: http://svn.apache.org/viewvc?rev=783313&view=rev
Log:
Revert r782166 as it introduced a regression of its own.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Parser.java?rev=783313&r1=783312&r2=783313&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Parser.java Wed Jun 10
12:15:42 2009
@@ -124,24 +124,25 @@
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;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
