Browse Source

Remotedir need not be specified for ftp to work.

PR: 4821, 5053

Submitted by:
Erik Hatcher "jakarta@ehatchersolutions.com"
Remco Slotboom "remco.slotboom@ctp.com"


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269999 13f79535-47bb-0310-9956-ffa450edef68
master
Magesh Umasankar 23 years ago
parent
commit
cd1fb76798
2 changed files with 5 additions and 4 deletions
  1. +2
    -0
      WHATSNEW
  2. +3
    -4
      src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java

+ 2
- 0
WHATSNEW View File

@@ -18,6 +18,8 @@ Changes that could break older environments:


Fixed bugs: Fixed bugs:
----------- -----------
* Fixed bug where ant would not perform ftp without remotedir being
specified even though this was not mandatory.


* Fixed bug where ant would not copy system properties into new Project * Fixed bug where ant would not copy system properties into new Project
in ant/antcall tasks when inheritall="false" is set. in ant/antcall tasks when inheritall="false" is set.


+ 3
- 4
src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java View File

@@ -603,7 +603,7 @@ public class FTP


FTPFile[] files = ftp.listFiles(remoteFile); FTPFile[] files = ftp.listFiles(remoteFile);


// For Microsoft's Ftp-Service an Array with length 0 is
// For Microsoft's Ftp-Service an Array with length 0 is
// returned if configured to return listings in "MS-DOS"-Format // returned if configured to return listings in "MS-DOS"-Format
if (files == null || files.length == 0) if (files == null || files.length == 0)
{ {
@@ -916,10 +916,9 @@ public class FTP
"could not change remote directory: " + "could not change remote directory: " +
ftp.getReplyString()); ftp.getReplyString());
} }

log(ACTION_STRS[action] + " files");
transferFiles(ftp);
} }
log(ACTION_STRS[action] + " files");
transferFiles(ftp);
} }


} }


Loading…
Cancel
Save