Change delete failure checks to use return code rather than separate call

to exists


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267717 13f79535-47bb-0310-9956-ffa450edef68

src/main/org/apache/tools/ant/taskdefs/Delete.java

@@ -123,8 +123,7 @@ public class Delete extends MatchingTask {
         }
         else {
           project.log("Deleting: " + f.getAbsolutePath());
-          f.delete();
-	  if (f.exists()) {
+          if (!f.delete()) {
 	      throw new BuildException("Unable to delete file " + f.getAbsolutePath());
           }
         }
@@ -148,8 +147,7 @@ public class Delete extends MatchingTask {
 
         if (f.exists()) {
           project.log("Deleting: " + f.getAbsolutePath(), verbosity);
-          f.delete();
-	  if (f.exists()) {
+          if (!f.delete()) {
 	      throw new BuildException("Unable to delete " + f.getAbsolutePath());
           }
         }

src/main/org/apache/tools/ant/taskdefs/Deltree.java

@@ -76,8 +76,7 @@ public class Deltree extends Task {
 
 	if (dir.exists()) {
 	    if (!dir.isDirectory()) {
-		dir.delete();
-		if (dir.exists()) {
+		if (!dir.delete()) {
         	    throw new BuildException("Unable to delete file " + dir.getAbsolutePath());
 	        }
 		return;
@@ -110,14 +109,12 @@ public class Deltree extends Task {
 	    if (f.isDirectory()) {
 		removeDir(f);
 	    } else {
-		f.delete();
-		if (f.exists()) {
+		if (!f.delete()) {
         	    throw new BuildException("Unable to delete file " + f.getAbsolutePath());
 	        }
 	    }
 	}
-        dir.delete();
-	if (dir.exists()) {
+        if (!dir.delete()) {
 	    throw new BuildException("Unable to delete directory " + dir.getAbsolutePath());
 	}
     }