Make <ftp>'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

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()) {