Author: mbenson
Date: Tue Apr 18 09:18:05 2006
New Revision: 394979
URL: http://svn.apache.org/viewcvs?rev=394979&view=rev
Log:
Use task project when filesets don't have a project, for backwards
compatibility.
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Delete.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Delete.java
URL:
http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Delete.java?rev=394979&r1=394978&r2=394979&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Delete.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Delete.java Tue Apr
18 09:18:05 2006
@@ -547,6 +547,12 @@
for (int i = 0; i < filesets.size(); i++) {
FileSet fs = (FileSet) filesets.get(i);
+ if (fs.getProject() == null) {
+ log("Deleting fileset with no project specified;"
+ + " assuming executing project", Project.MSG_VERBOSE);
+ fs = (FileSet) fs.clone();
+ fs.setProject(getProject());
+ }
resourcesToDelete.add(fs);
if (includeEmpty && fs.getDir().isDirectory()) {
filesetDirs.add(new ReverseDirs(fs.getDir(),
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
