mbenson 2004/04/20 15:15:19
Modified: src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Delete.java
Log:
Sync to HEAD
Revision Changes Path
No revision
No revision
1.47.2.5 +6 -2 ant/src/main/org/apache/tools/ant/taskdefs/Delete.java
Index: Delete.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Delete.java,v
retrieving revision 1.47.2.4
retrieving revision 1.47.2.5
diff -u -r1.47.2.4 -r1.47.2.5
--- Delete.java 9 Mar 2004 17:01:33 -0000 1.47.2.4
+++ Delete.java 20 Apr 2004 22:15:19 -0000 1.47.2.5
@@ -22,6 +22,7 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.condition.Os;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.PatternSet;
import org.apache.tools.ant.types.selectors.AndSelector;
@@ -528,12 +529,15 @@
// protected and private methods
//************************************************************************
/**
- * Attempt to fix possible race condition when deleting
- * files on WinXP. If the delete does not work,
+ * Accommodate Windows bug encountered in both Sun and IBM JDKs.
+ * Others possible. If the delete does not work, call System.gc(),
* wait a little and try again.
*/
private boolean delete(File f) {
if (!f.delete()) {
+ if (Os.isFamily("windows")) {
+ System.gc();
+ }
try {
Thread.sleep(DELETE_RETRY_SLEEP_MILLIS);
return f.delete();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
