This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
commit 2c35eaaa64d850a386d11662058810bea9ce6f98
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Oct 1 08:50:12 2023 -0400
[IO-811] FileUtils.iterateFiles(File, String[], boolean) fails to close
its internal Stream
Different version of solution from PR #489 by Adam Rauch
---
src/changes/changes.xml | 3 +++
src/main/java/org/apache/commons/io/FileUtils.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index b1213828..c3c893bf 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -60,6 +60,9 @@ The <action> type attribute can be add,update,fix,remove.
<action dev="ggregory" type="fix" issue="IO-811" due-to="Adam Rauch,
Gary Gregory">
FileUtils.listFiles(File, String[], boolean) fails to close its
internal Stream.
</action>
+ <action dev="ggregory" type="fix" issue="IO-811" due-to="Adam Rauch,
Gary Gregory">
+ FileUtils.iterateFiles(File, String[], boolean) fails to close its
internal Stream.
+ </action>
</release>
<release version="2.14.0" date="2023-09-24" description="Java 8 is
required.">
<!-- FIX -->
diff --git a/src/main/java/org/apache/commons/io/FileUtils.java
b/src/main/java/org/apache/commons/io/FileUtils.java
index 0050aa47..dbada143 100644
--- a/src/main/java/org/apache/commons/io/FileUtils.java
+++ b/src/main/java/org/apache/commons/io/FileUtils.java
@@ -1996,7 +1996,7 @@ public class FileUtils {
* @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 StreamIterator.iterator(Uncheck.get(() ->
streamFiles(directory, recursive, extensions)));
}
/**
