Skip to content

Commit 0259c0b

Browse files
committed
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 <[email protected]>
1 parent 440ef41 commit 0259c0b

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

WHATSNEW

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
Changes from Ant 1.10.6 TO Ant 1.10.7
22
=====================================
33

4+
Fixed bugs:
5+
-----------
6+
7+
* FTP task no longer duplicates a check for a file being a symlink.
8+
Bugzilla Report 63259
9+
410

511
Changes from Ant 1.10.5 TO Ant 1.10.6
612
=====================================

src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,9 @@ protected void scandir(String dir, String vpath, boolean fast) {
537537
} else {
538538
if (!isFollowSymlinks() && file.isSymbolicLink()) {
539539
filesExcluded.addElement(name);
540-
} else if (isFunctioningAsFile(ftp, dir, file)) {
540+
} else {
541+
// at this point, it's either a symbolic link or a file, but not a directory.
542+
// so we include it
541543
accountForIncludedFile(name);
542544
}
543545
}

0 commit comments

Comments
 (0)