Author: remy.maucherat(a)jboss.com Date: 2008-11-03 18:49:56 -0500 (Mon, 03 Nov 2008) New Revision: 846 Modified: trunk/PATCHES.txt trunk/java/org/apache/jasper/compiler/ParserController.java trunk/webapps/docs/changelog.xml Log: - Port Jasper patch. Modified: trunk/PATCHES.txt =================================================================== --- trunk/PATCHES.txt 2008-11-03 22:10:24 UTC (rev 845) +++ trunk/PATCHES.txt 2008-11-03 23:49:56 UTC (rev 846) @@ -11,3 +11,6 @@ http://svn.apache.org/viewvc?rev=709018&view=rev Async logger is not ready + +http://svn.apache.org/viewvc?rev=710179&view=rev +Invoker servlet removal Modified: trunk/java/org/apache/jasper/compiler/ParserController.java =================================================================== --- trunk/java/org/apache/jasper/compiler/ParserController.java 2008-11-03 22:10:24 UTC (rev 845) +++ trunk/java/org/apache/jasper/compiler/ParserController.java 2008-11-03 23:49:56 UTC (rev 846) @@ -191,7 +191,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) { Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2008-11-03 22:10:24 UTC (rev 845) +++ trunk/webapps/docs/changelog.xml 2008-11-03 23:49:56 UTC (rev 846) @@ -165,6 +165,10 @@ <fix> Fix regression in Big* types handling. Patch provided by Nils Eckert. (markt) </fix> + <fix> + <bug>46047</bug>: Include jar in path for dependencies if they are in a JAR. + Patch provided by C�dric Mailleux. (markt) + </fix> </changelog> </subsection> <subsection name="Others">