View | Details | Raw Unified | Return to bug 34722
Collapse All | Expand All

(-)src/main/org/apache/tools/ant/DirectoryScanner.java (+9 lines)
Lines 956-961 Link Here
956
        try {
956
        try {
957
            synchronized (this) {
957
            synchronized (this) {
958
958
959
                // set in/excludes to reasonable defaults if needed:
960
                boolean nullIncludes = (includes == null);
961
                includes = nullIncludes ? new String[] {"**"} : includes;
962
                boolean nullExcludes = (excludes == null);
963
                excludes = nullExcludes ? new String[0] : excludes;
964
959
                String[] excl = new String[dirsExcluded.size()];
965
                String[] excl = new String[dirsExcluded.size()];
960
                dirsExcluded.copyInto(excl);
966
                dirsExcluded.copyInto(excl);
961
        
967
        
Lines 974-979 Link Here
974
                                notIncl[i] + File.separator, false);
980
                                notIncl[i] + File.separator, false);
975
                    }
981
                    }
976
                }
982
                }
983
                clearCaches();
984
                includes = nullIncludes ? null : includes;
985
                excludes = nullExcludes ? null : excludes;
977
            }
986
            }
978
        } finally {
987
        } finally {
979
            synchronized (slowScanLock) {
988
            synchronized (slowScanLock) {

Return to bug 34722