From 5766a65012d0debf1bea2a11b2b04f99130cfd8d Mon Sep 17 00:00:00 2001 From: Peter Reilly Date: Wed, 1 Dec 2004 13:45:48 +0000 Subject: [PATCH] use absolute path instread of canonical path in subant PR: 30438 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277091 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 3 +++ src/main/org/apache/tools/ant/taskdefs/SubAnt.java | 8 +------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/WHATSNEW b/WHATSNEW index 36788ad67..672a8a69a 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -103,6 +103,9 @@ Changes from Ant 1.6.2 to current Ant 1.6 CVS version Changes that could break older environments: -------------------------------------------- +* The subant task used the canonical version of a file path. This + has been changed to use the absolute path. Bugzilla 30438. + Other changes: -------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/SubAnt.java b/src/main/org/apache/tools/ant/taskdefs/SubAnt.java index 1d498e674..602c9ee20 100644 --- a/src/main/org/apache/tools/ant/taskdefs/SubAnt.java +++ b/src/main/org/apache/tools/ant/taskdefs/SubAnt.java @@ -253,13 +253,7 @@ public class SubAnt } ant = createAntTask(directory); - String antfilename = null; - try { - antfilename = file.getCanonicalPath(); - } catch (IOException e) { - throw new BuildException(e); - } - + String antfilename = file.getAbsolutePath() ant.setAntfile(antfilename); try { ant.execute();