conor 2003/03/07 06:58:14
Modified: src/main/org/apache/tools/ant/taskdefs/optional/net Tag:
ANT_15_BRANCH FTP.java
Log:
Merge
Revision Changes Path
No revision
No revision
1.21.2.8 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
Index: FTP.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java,v
retrieving revision 1.21.2.7
retrieving revision 1.21.2.8
diff -u -w -u -r1.21.2.7 -r1.21.2.8
--- FTP.java 21 Feb 2003 10:44:42 -0000 1.21.2.7
+++ FTP.java 7 Mar 2003 14:58:14 -0000 1.21.2.8
@@ -629,7 +629,7 @@
String cwd = ftp.printWorkingDirectory();
String parent = dir.getParent();
if (parent != null) {
- if (!ftp.changeWorkingDirectory(parent)) {
+ if (!ftp.changeWorkingDirectory(resolveFile(parent))) {
throw new BuildException("could not change to "
+ "directory: " + ftp.getReplyString());
}