Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 71660 invoked from network); 4 Dec 2003 22:57:55 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 4 Dec 2003 22:57:55 -0000 Received: (qmail 36566 invoked by uid 500); 4 Dec 2003 22:57:34 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 36532 invoked by uid 500); 4 Dec 2003 22:57:34 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 36494 invoked by uid 500); 4 Dec 2003 22:57:33 -0000 Received: (qmail 36476 invoked from network); 4 Dec 2003 22:57:33 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 4 Dec 2003 22:57:33 -0000 Received: (qmail 71344 invoked by uid 1384); 4 Dec 2003 22:57:45 -0000 Date: 4 Dec 2003 22:57:45 -0000 Message-ID: <20031204225745.71340.qmail@minotaur.apache.org> From: kinman@apache.org To: jakarta-tomcat-jasper-cvs@apache.org Subject: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler ParserController.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N kinman 2003/12/04 14:57:45 Modified: jasper2/src/share/org/apache/jasper/compiler ParserController.java Log: - When a tag file include a file, make sure the included file environment maintains the isTag and directiveOnly properties. Revision Changes Path 1.48 +8 -2 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ParserController.java Index: ParserController.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ParserController.java,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- ParserController.java 1 Dec 2003 19:31:37 -0000 1.47 +++ ParserController.java 4 Dec 2003 22:57:45 -0000 1.48 @@ -103,6 +103,8 @@ private String sourceEnc; private boolean isDefaultPageEncoding; + private boolean isTagFile; + private boolean directiveOnly; /* * Constructor @@ -132,7 +134,8 @@ // (using an include directive), ctxt.getTagFileJar() returns the // JAR file from which to read the tag file or included resource, // respectively. - return parse(inFileName, null, ctxt.getTagFileJarUrl()); + return parse(inFileName, null, ctxt.isTagFile(), false, + ctxt.getTagFileJarUrl()); } /** @@ -146,7 +149,8 @@ public Node.Nodes parse(String inFileName, Node parent, URL jarFileUrl) throws FileNotFoundException, JasperException, IOException { - return parse(inFileName, parent, ctxt.isTagFile(), false, jarFileUrl); + // For files statically included, keep isTagfile and directiveOnly + return parse(inFileName, parent, isTagFile, directiveOnly, jarFileUrl); } /** @@ -187,6 +191,8 @@ Node.Nodes parsedPage = null; isEncodingSpecifiedInProlog = false; isDefaultPageEncoding = false; + this.isTagFile = isTagFile; + this.directiveOnly = directiveOnly; JarFile jarFile = getJarFile(jarFileUrl); String absFileName = resolveFileName(inFileName); --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org