Skip to content

IO-811: Files.walk() direct and indirect callers fail to close the re… #489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
labkey-adam wants to merge 3 commits into from
Closed

IO-811: Files.walk() direct and indirect callers fail to close the re… #489

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aeba301
IO-811: Files.walk() direct and indirect callers fail to close the re…
labkey-adam Sep 30, 2023
63846df
Address formatting nits
labkey-adam Sep 30, 2023
d325a79
Back out IDE auto-formatting
labkey-adam Sep 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 28 additions & 2 deletions src/main/java/org/apache/commons/io/FileUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1996,7 +1996,29 @@ public static Iterator<File> iterateFiles(final File directory, final IOFileFilt
* @since 1.2
*/
public static Iterator<File> iterateFiles(final File directory, final String[] extensions, final boolean recursive) {
return Uncheck.apply(d -> streamFiles(d, recursive, extensions).iterator(), directory);
return Uncheck.apply(d -> {
Stream<File> stream = streamFiles(d, recursive, extensions);
Iterator<File> iter = stream.iterator();

// Wrap the iterator to allow closing the stream after consumption
return new Iterator<File>() {
@Override
public boolean hasNext() {
boolean ret = iter.hasNext();

if (!ret) {
stream.close();
}

return ret;
}

@Override
public File next() {
return iter.next();
}
};
}, directory);

@garydgregory garydgregory Oct 1, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need for an anonymous class:

return StreamIterator.iterator(Uncheck.get(() -> streamFiles(directory, recursive, extensions)));

}

/**
Expand Down Expand Up @@ -2238,7 +2260,11 @@ public static Collection<File> listFiles(final File directory, final IOFileFilte
* @return a collection of java.io.File with the matching files
*/
public static Collection<File> listFiles(final File directory, final String[] extensions, final boolean recursive) {
return Uncheck.apply(d -> toList(streamFiles(d, recursive, extensions)), directory);
return Uncheck.apply(d -> {

@garydgregory garydgregory Oct 1, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've adopted a variant of this fix in git master. You are credited in changes.xml :-)

try (Stream<File> fileStream = streamFiles(d, recursive, extensions)) {
return toList(fileStream);
}
}, directory);
}

/**
Expand Down