Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 18261 invoked from network); 3 Nov 2008 22:47:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Nov 2008 22:47:54 -0000 Received: (qmail 69983 invoked by uid 500); 3 Nov 2008 22:47:54 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 69935 invoked by uid 500); 3 Nov 2008 22:47:54 -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 69921 invoked by uid 99); 3 Nov 2008 22:47:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Nov 2008 14:47:54 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Nov 2008 22:46:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 30852238889E; Mon, 3 Nov 2008 14:47:27 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r710205 - /tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java Date: Mon, 03 Nov 2008 22:47:27 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081103224727.30852238889E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Mon Nov 3 14:47:26 2008 New Revision: 710205 URL: http://svn.apache.org/viewvc?rev=710205&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46047 Include jar in path for dependencies if they are in a JAR Patch provided by Cédric Mailleux Modified: tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java Modified: tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java?rev=710205&r1=710204&r2=710205&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java Mon Nov 3 14:47:26 2008 @@ -192,7 +192,12 @@ if (parent != null) { // Included resource, add to dependent list - compiler.getPageInfo().addDependant(absFileName); + if (jarFile == null) { + compiler.getPageInfo().addDependant(absFileName); + } else { + compiler.getPageInfo().addDependant( + jarFileUrl.toExternalForm() + absFileName.substring(1)); + } } if ((isXml && isEncodingSpecifiedInProlog) || isBomPresent) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org