From 7046631e9a490e203f61b419a272aed0d428506c Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Sun, 24 Jan 2016 19:35:29 +0100
Subject: [PATCH] normalize file names when importing files with absolute paths

this is the root cause of Bugzilla Issue 58886
---
 WHATSNEW                                               | 5 +++++
 src/main/org/apache/tools/ant/taskdefs/ImportTask.java | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/WHATSNEW b/WHATSNEW
index 0d06316c4..ccf3548aa 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -33,6 +33,11 @@ Fixed bugs:
  * <script> could fail to find javax.script on JDK9 with Jigsaw.
    Bugzilla Report 58271
 
+ * <import> sometimes failed to normalize file names which could lead
+   to files getting imported twice which in turn could lead to targets
+   getting executed twice.
+   Bugzilla Report 58886
+
 Other changes:
 --------------
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/ImportTask.java b/src/main/org/apache/tools/ant/taskdefs/ImportTask.java
index 6b82a3647..63adf718d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ImportTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ImportTask.java
@@ -241,7 +241,7 @@ public class ImportTask extends Task {
 
         if (file != null) {
             if (isExistingAbsoluteFile(file)) {
-                return new FileResource(new File(file));
+                return new FileResource(FILE_UTILS.normalize(file));
             }
 
             File buildFile =