kinman 2002/09/11 14:50:02
Modified: jasper2/src/share/org/apache/jasper/compiler
TagFileProcessor.java
Log:
- Add tag files that are referenced indirectly to the dependency list.
Revision Changes Path
1.26 +13 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagFileProcessor.java
Index: TagFileProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagFileProcessor.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- TagFileProcessor.java 11 Sep 2002 20:52:44 -0000 1.25
+++ TagFileProcessor.java 11 Sep 2002 21:50:02 -0000 1.26
@@ -336,7 +336,7 @@
*/
private Class loadTagFile(Compiler compiler,
String tagFilePath, TagInfo tagInfo,
- TagData tagData)
+ TagData tagData, PageInfo parentPageInfo)
throws JasperException {
JspCompilationContext ctxt = compiler.getCompilationContext();
@@ -383,6 +383,15 @@
wrapper.decTripCount();
}
+ // Add the dependants for this tag file to its parent's
+ // dependant list.
+ PageInfo pageInfo = wrapper.getJspEngineContext().getCompiler().
+ getPageInfo();
+ Iterator iter = pageInfo.getDependants().iterator();
+ if (iter.hasNext()) {
+ parentPageInfo.addDependant((String)iter.next());
+ }
+
return tagClass;
}
}
@@ -409,7 +418,7 @@
String tagFilePath = tagFileInfo.getPath();
pageInfo.addDependant(tagFilePath);
Class c = loadTagFile(compiler, tagFilePath, n.getTagInfo(),
- n.getTagData());
+ n.getTagData(), pageInfo);
n.setTagHandlerClass(c);
}
visitBody(n);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
