From 38446ae4315ec20bbf8c811721c0cc5c73d8a3b6 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Thu, 22 Apr 2010 10:05:47 +0000 Subject: [PATCH] looks as if bug 41948 was reappearing on Win7, needs further inverstigation - add some diagnostics git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@936720 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/taskdefs/Move.java | 2 ++ src/main/org/apache/tools/ant/util/FileUtils.java | 1 + 2 files changed, 3 insertions(+) diff --git a/src/main/org/apache/tools/ant/taskdefs/Move.java b/src/main/org/apache/tools/ant/taskdefs/Move.java index 30d6d01df..bd74605a1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Move.java +++ b/src/main/org/apache/tools/ant/taskdefs/Move.java @@ -338,6 +338,8 @@ public class Move extends Copy { destFile = getFileUtils().normalize(destFile.getAbsolutePath()); if (destFile.equals(sourceFile)) { //no point in renaming a file to its own canonical version... + log("Rename of " + sourceFile + " to " + destFile + + " is a no-op.", Project.MSG_VERBOSE); return true; } if (!(sourceFile.equals(destFile.getCanonicalFile()) || destFile.delete())) { diff --git a/src/main/org/apache/tools/ant/util/FileUtils.java b/src/main/org/apache/tools/ant/util/FileUtils.java index 9bcd5bc95..31d627adf 100644 --- a/src/main/org/apache/tools/ant/util/FileUtils.java +++ b/src/main/org/apache/tools/ant/util/FileUtils.java @@ -1223,6 +1223,7 @@ public class FileUtils { * @since Ant 1.6 */ public void rename(File from, File to) throws IOException { + // identical logic lives in Move.renameFile(): from = normalize(from.getAbsolutePath()).getCanonicalFile(); to = normalize(to.getAbsolutePath()); if (!from.exists()) {