tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r710205 - /tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
Date Mon, 03 Nov 2008 22:47:27 GMT
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


Mime
View raw message