From 1cddc5e63805e05996e688f206169b36b4e8c9b3 Mon Sep 17 00:00:00 2001 From: Matthew Jason Benson Date: Thu, 12 Oct 2006 15:45:53 +0000 Subject: [PATCH] fix failures git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@463287 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/types/Path.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/org/apache/tools/ant/types/Path.java b/src/main/org/apache/tools/ant/types/Path.java index 730f012b2..a2c835623 100644 --- a/src/main/org/apache/tools/ant/types/Path.java +++ b/src/main/org/apache/tools/ant/types/Path.java @@ -247,6 +247,7 @@ public class Path extends DataType implements Cloneable, ResourceCollection { union.setProject(getProject()); } union.add(c); + setChecked(false); } /** @@ -319,7 +320,8 @@ public class Path extends DataType implements Cloneable, ResourceCollection { if (isReference()) { return ((Path) getCheckedRef()).list(); } - return union == null ? new String[0] : union.list(); + return assertFilesystemOnly(union) == null + ? new String[0] : union.list(); } /** @@ -440,7 +442,9 @@ public class Path extends DataType implements Cloneable, ResourceCollection { super.dieOnCircularReference(stk, p); } else { if (union != null) { + stk.push(union); invokeCircularReferenceCheck(union, stk, p); + stk.pop(); } setChecked(true); }