You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2018/02/13 20:51:02 UTC

ant git commit: Revert "Java8 refactoring removed call to DirectoryScanner.scan"

Repository: ant
Updated Branches:
  refs/heads/master c813b4d8d -> 495c0ed8e


Revert "Java8 refactoring removed call to DirectoryScanner.scan"

the call to scan is redundant as supportFileSet.getDirectoryScanner
has already called scan internally.

This reverts commit eab7f04cac436a670d83ac91b416aa2eab28f4b7.


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/495c0ed8
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/495c0ed8
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/495c0ed8

Branch: refs/heads/master
Commit: 495c0ed8ee7b2c6a646f5037e9d678d5ad2023ab
Parents: c813b4d
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Feb 13 21:50:03 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Feb 13 21:50:03 2018 +0100

----------------------------------------------------------------------
 .../tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java      | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/495c0ed8/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
index 223bc0a..64672c9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
@@ -520,7 +520,6 @@ public class GenericDeploymentTool implements EJBDeploymentTool {
         for (FileSet supportFileSet : config.supportFileSets) {
             File supportBaseDir = supportFileSet.getDir(project);
             DirectoryScanner supportScanner = supportFileSet.getDirectoryScanner(project);
-            supportScanner.scan();
             for (String supportFile : supportScanner.getIncludedFiles()) {
                 ejbFiles.put(supportFile, new File(supportBaseDir, supportFile));
             }