From b7e18b46c407a3a2b29b632055eb03d5ad434151 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Mon, 15 Apr 2002 09:57:34 +0000 Subject: [PATCH] Make 's directory scanner behave the same way as the one for normal filesets when it comes to pattern matching. The current version did not look at the directory part at all. PR: 4411 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272430 13f79535-47bb-0310-9956-ffa450edef68 --- .../tools/ant/taskdefs/optional/net/FTP.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java index 550a88ea8..d14ca21c1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java @@ -206,29 +206,31 @@ public class FTP if (!file.getName().equals(".") && !file.getName().equals("..")) { if (file.isDirectory()) { - String name = file.getName(); + String name = vpath + file.getName(); if (isIncluded(name)) { if (!isExcluded(name)) { dirsIncluded.addElement(name); if (fast) { - scandir(name, - vpath + name + File.separator, - fast); + scandir(file.getName(), + name + File.separator, fast); } } else { dirsExcluded.addElement(name); + if (fast && couldHoldIncluded(name)) { + scandir(file.getName(), + name + File.separator, fast); + } } } else { dirsNotIncluded.addElement(name); if (fast && couldHoldIncluded(name)) { - scandir(name, - vpath + name + File.separator, - fast); + scandir(file.getName(), + name + File.separator, fast); } } if (!fast) { - scandir(name, vpath + name + File.separator, - fast); + scandir(file.getName(), + name + File.separator, fast); } } else { if (file.isFile()) {