User: vharcq
Date: 02/05/22 13:08:05
Modified: core/src/xdoclet/tagshandler Tag: MODULE_REFACTORING_BRANCH
MergeTagsHandler.java
Log:
Treat the case of Orion in Timestamp checking, this is a template file that merge
itself.
Revision Changes Path
No revision
No revision
1.1.2.5 +8 -2 xdoclet/core/src/xdoclet/tagshandler/Attic/MergeTagsHandler.java
Index: MergeTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/tagshandler/Attic/MergeTagsHandler.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -w -r1.1.2.4 -r1.1.2.5
--- MergeTagsHandler.java 13 May 2002 22:24:15 -0000 1.1.2.4
+++ MergeTagsHandler.java 22 May 2002 20:08:05 -0000 1.1.2.5
@@ -30,7 +30,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
* @xdoclet:taghandler namespace="Merge"
- * @version $Revision: 1.1.2.4 $
+ * @version $Revision: 1.1.2.5 $
*/
public class MergeTagsHandler extends XDocletTagSupport
{
@@ -143,7 +143,13 @@
File mergeFile = new
File(getDocletContext().getActiveSubTask().getMergeDir(), mergeFilePattern);
if (getParser() != null) {
+ // This avoids infinite loop when a merge file merge itself
+ if (getParser().hasMergeFile(mergeFilePattern)) {
+ return null;
+ }
+ else {
getParser().addMergeFile(mergeFilePattern);
+ }
}
if (mergeFile.exists()) {
_______________________________________________________________
Don't miss the 2002 Sprint PCS Application Developer's Conference
August 25-28 in Las Vegas -- http://devcon.sprintpcs.com/adp/index.cfm
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
