Browse Source

Not 100% sure this fixes the entire bug, but it eliminates NPEs for me.

PR: 34722


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@278219 13f79535-47bb-0310-9956-ffa450edef68
master
Matthew Jason Benson 20 years ago
parent
commit
2fbb2e62ab
1 changed files with 9 additions and 0 deletions
  1. +9
    -0
      src/main/org/apache/tools/ant/DirectoryScanner.java

+ 9
- 0
src/main/org/apache/tools/ant/DirectoryScanner.java View File

@@ -956,6 +956,12 @@ public class DirectoryScanner
try {
synchronized (this) {

// set in/excludes to reasonable defaults if needed:
boolean nullIncludes = (includes == null);
includes = nullIncludes ? new String[] {"**"} : includes;
boolean nullExcludes = (excludes == null);
excludes = nullExcludes ? new String[0] : excludes;

String[] excl = new String[dirsExcluded.size()];
dirsExcluded.copyInto(excl);
@@ -974,6 +980,9 @@ public class DirectoryScanner
notIncl[i] + File.separator, false);
}
}
clearCaches();
includes = nullIncludes ? null : includes;
excludes = nullExcludes ? null : excludes;
}
} finally {
synchronized (slowScanLock) {


Loading…
Cancel
Save