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

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@710205 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/jasper/compiler/ParserController.java b/java/org/apache/jasper/compiler/ParserController.java
index 8c29fd6..25f3c39 100644 (file)
--- 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) {