Browse Source

bz-63259 Don't check the FTP file for being a symlink, more than once

Patch contributed by Eugène Adell, as an attachment in the bugzilla issue.

Signed-off-by: Jaikiran Pai <jaikiran@apache.org>
master
Jaikiran Pai 6 years ago
parent
commit
0259c0b981
2 changed files with 9 additions and 1 deletions
  1. +6
    -0
      WHATSNEW
  2. +3
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java

+ 6
- 0
WHATSNEW View File

@@ -1,6 +1,12 @@
Changes from Ant 1.10.6 TO Ant 1.10.7
=====================================

Fixed bugs:
-----------

* FTP task no longer duplicates a check for a file being a symlink.
Bugzilla Report 63259


Changes from Ant 1.10.5 TO Ant 1.10.6
=====================================


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

@@ -537,7 +537,9 @@ public class FTP extends Task implements FTPTaskConfig {
} else {
if (!isFollowSymlinks() && file.isSymbolicLink()) {
filesExcluded.addElement(name);
} else if (isFunctioningAsFile(ftp, dir, file)) {
} else {
// at this point, it's either a symbolic link or a file, but not a directory.
// so we include it
accountForIncludedFile(name);
}
}


Loading…
Cancel
Save