Author: mbenson
Date: Thu Oct 12 08:45:53 2006
New Revision: 463287
URL: http://svn.apache.org/viewvc?view=rev&rev=463287
Log:
fix failures
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/Path.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/Path.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/Path.java?view=diff&rev=463287&r1=463286&r2=463287
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/types/Path.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/Path.java Thu Oct 12
08:45:53 2006
@@ -247,6 +247,7 @@
union.setProject(getProject());
}
union.add(c);
+ setChecked(false);
}
/**
@@ -319,7 +320,8 @@
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 @@
super.dieOnCircularReference(stk, p);
} else {
if (union != null) {
+ stk.push(union);
invokeCircularReferenceCheck(union, stk, p);
+ stk.pop();
}
setChecked(true);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
