ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r703153 - in /ant/core/trunk/src/main/org/apache/tools/ant: taskdefs/Delete.java util/FileUtils.java
Date Thu, 09 Oct 2008 12:25:40 GMT
Author: bodewig
Date: Thu Oct  9 05:25:40 2008
New Revision: 703153

URL: http://svn.apache.org/viewvc?rev=703153&view=rev
Log:
whitespace

Modified:
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Delete.java
    ant/core/trunk/src/main/org/apache/tools/ant/util/FileUtils.java

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Delete.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Delete.java?rev=703153&r1=703152&r2=703153&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 Thu Oct  9 05:25:40
2008
@@ -661,15 +661,15 @@
      */
     private boolean delete(File f) {
         if (!FILE_UTILS.tryHardToDelete(f)) {
-                if (deleteOnExit) {
-                    int level = quiet ? Project.MSG_VERBOSE : Project.MSG_INFO;
-                    log("Failed to delete " + f + ", calling deleteOnExit."
-                        + " This attempts to delete the file when the Ant jvm"
-                        + " has exited and might not succeed.", level);
-                    f.deleteOnExit();
-                    return true;
-                }
-                return false;
+            if (deleteOnExit) {
+                int level = quiet ? Project.MSG_VERBOSE : Project.MSG_INFO;
+                log("Failed to delete " + f + ", calling deleteOnExit."
+                    + " This attempts to delete the file when the Ant jvm"
+                    + " has exited and might not succeed.", level);
+                f.deleteOnExit();
+                return true;
+            }
+            return false;
         }
         return true;
     }

Modified: ant/core/trunk/src/main/org/apache/tools/ant/util/FileUtils.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/FileUtils.java?rev=703153&r1=703152&r2=703153&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/util/FileUtils.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/util/FileUtils.java Thu Oct  9 05:25:40 2008
@@ -1230,7 +1230,8 @@
             System.err.println("Rename of " + from + " to " + to + " is a no-op.");
             return;
         }
-        if (to.exists() && !(from.equals(to.getCanonicalFile()) || tryHardToDelete(to)))
{
+        if (to.exists() &&
+            !(from.equals(to.getCanonicalFile()) || tryHardToDelete(to))) {
             throw new IOException("Failed to delete " + to + " while trying to rename " +
from);
         }
         File parent = to.getParentFile();



Mime
View raw message