You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@commons.apache.org by "labkey-adam (via GitHub)" <gi...@apache.org> on 2023/09/30 18:51:49 UTC
[GitHub] [commons-io] labkey-adam commented on a diff in pull request #489: IO-811: Files.walk() direct and indirect callers fail to close the re…
labkey-adam commented on code in PR #489:
URL: https://github.com/apache/commons-io/pull/489#discussion_r1341997726
##########
src/main/java/org/apache/commons/io/FileUtils.java:
##########
@@ -1996,7 +1996,28 @@ 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)
Review Comment:
Done
##########
src/main/java/org/apache/commons/io/FileUtils.java:
##########
@@ -1996,7 +1996,28 @@ 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>(){
Review Comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@commons.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org