peterreilly 2004/12/01 06:04:36
Modified: . Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
SubAnt.java
Log:
sync
Revision Changes Path
No revision
No revision
1.503.2.145 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.144
retrieving revision 1.503.2.145
diff -u -r1.503.2.144 -r1.503.2.145
--- WHATSNEW 18 Nov 2004 09:49:24 -0000 1.503.2.144
+++ WHATSNEW 1 Dec 2004 14:04:36 -0000 1.503.2.145
@@ -4,6 +4,9 @@
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:
--------------
No revision
No revision
1.9.2.9 +1 -7 ant/src/main/org/apache/tools/ant/taskdefs/SubAnt.java
Index: SubAnt.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/SubAnt.java,v
retrieving revision 1.9.2.8
retrieving revision 1.9.2.9
diff -u -r1.9.2.8 -r1.9.2.9
--- SubAnt.java 2 Jul 2004 07:24:56 -0000 1.9.2.8
+++ SubAnt.java 1 Dec 2004 14:04:36 -0000 1.9.2.9
@@ -253,13 +253,7 @@
}
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();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
