Update of /cvsroot/xdoclet/xdoclet/core/src/xdoclet/tagshandler
In directory sc8-pr-cvs1:/tmp/cvs-serv23838/src/xdoclet/tagshandler
Modified Files:
MergeTagsHandler.java
Log Message:
fixed XDT-504
Index: MergeTagsHandler.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/tagshandler/MergeTagsHandler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** MergeTagsHandler.java 29 Apr 2003 19:14:10 -0000 1.9
--- MergeTagsHandler.java 30 May 2003 08:57:27 -0000 1.10
***************
*** 209,212 ****
--- 209,225 ----
if (jarResource != null) {
log.debug("Merge file found in jar");
+
+ if (getEngine() instanceof TemplateParser) {
+ TemplateParser parser = (TemplateParser) getEngine();
+
+ // This avoids infinite loop when a merge file merge itself
+ if (parser.hasMergeFile(mergeFilePattern)) {
+ return null;
+ }
+ else {
+ parser.addMergeFile(mergeFilePattern);
+ }
+ }
+
file = FileManager.getURLContent(jarResource);
}
-------------------------------------------------------
This SF.net email is sponsored by: eBay
Get office equipment for less on eBay!
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
