Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 67773 invoked from network); 15 Nov 2005 22:46:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 15 Nov 2005 22:46:04 -0000 Received: (qmail 27913 invoked by uid 500); 15 Nov 2005 22:46:00 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 27876 invoked by uid 500); 15 Nov 2005 22:45:59 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 27865 invoked by uid 500); 15 Nov 2005 22:45:59 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 27853 invoked by uid 99); 15 Nov 2005 22:45:59 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 15 Nov 2005 14:45:59 -0800 Received: (qmail 67594 invoked by uid 65534); 15 Nov 2005 22:45:39 -0000 Message-ID: <20051115224539.67589.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r344456 - /tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java Date: Tue, 15 Nov 2005 22:45:38 -0000 To: tomcat-dev@jakarta.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: markt Date: Tue Nov 15 14:45:34 2005 New Revision: 344456 URL: http://svn.apache.org/viewcvs?rev=344456&view=rev Log: Fix infinite recursion when calling EL function in same taglib from tabfile (bug 35276) - Patch provided by Kin-man Modified: tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java Modified: tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java URL: http://svn.apache.org/viewcvs/tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java?rev=344456&r1=344455&r2=344456&view=diff ============================================================================== --- tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java (original) +++ tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java Tue Nov 15 14:45:34 2005 @@ -459,7 +459,7 @@ private void processChars() throws SAXException { - if (charBuffer == null) { + if (charBuffer == null || directivesOnly) { return; } @@ -758,6 +758,11 @@ public void startPrefixMapping(String prefix, String uri) throws SAXException { TagLibraryInfo taglibInfo; + + if (directivesOnly && !(JSP_URI.equals(uri))) { + return; + } + try { taglibInfo = getTaglibInfo(prefix, uri); } catch (JasperException je) { @@ -781,6 +786,14 @@ * Receives notification of the end of a Namespace mapping. */ public void endPrefixMapping(String prefix) throws SAXException { + + if (directivesOnly) { + String uri = pageInfo.getURI(prefix); + if (!JSP_URI.equals(uri)) { + return; + } + } + pageInfo.popPrefixMapping(prefix); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org