From 27c65588264fecedfe1940be2f1b09665f0c0b3e Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 3 Nov 2008 22:47:26 +0000 Subject: [PATCH] =?utf8?q?Fix=20https://issues.apache.org/bugzilla/show=5F?= =?utf8?q?bug.cgi=3Fid=3D46047=20Include=20jar=20in=20path=20for=20depende?= =?utf8?q?ncies=20if=20they=20are=20in=20a=20JAR=20Patch=20provided=20by?= =?utf8?q?=20C=C3=A9dric=20Mailleux?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@710205 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/jasper/compiler/ParserController.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/java/org/apache/jasper/compiler/ParserController.java b/java/org/apache/jasper/compiler/ParserController.java index 8c29fd6d7..25f3c39a7 100644 --- a/java/org/apache/jasper/compiler/ParserController.java +++ b/java/org/apache/jasper/compiler/ParserController.java @@ -192,7 +192,12 @@ class ParserController implements TagConstants { 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) { -- 2.11.0