From 99406c1ca4024bf8eff98d3515405d46689ccf39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Prante?= Date: Fri, 1 Dec 2023 15:01:26 +0100 Subject: [PATCH] return open stream to caller in walk --- files-api/src/main/java/org/xbib/files/FileService.java | 6 ++++-- gradle.properties | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/files-api/src/main/java/org/xbib/files/FileService.java b/files-api/src/main/java/org/xbib/files/FileService.java index 8bae9b8..d6643e3 100644 --- a/files-api/src/main/java/org/xbib/files/FileService.java +++ b/files-api/src/main/java/org/xbib/files/FileService.java @@ -120,14 +120,16 @@ public interface FileService { /** * Replacement for Files.walk() without AccessDeniedException. + * Caller must use a try-with-resources statement. + * * @param p the path * @return a stream of readable files under the path */ static Stream walk(Path p) { if (Files.isReadable(p)) { if (Files.isDirectory(p)) { - try (Stream stream = Files.list(p)) { - return stream.flatMap(FileService::walk); + try { + return Files.list(p).flatMap(FileService::walk); } catch (IOException e) { Logger.getLogger(FileService.class.getName()) .log(Level.FINE,"skipped " + p + " because of " + e.getMessage()); diff --git a/gradle.properties b/gradle.properties index f803b8b..771ba40 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = org.xbib name = files -version = 4.2.0 +version = 4.2.1 org.gradle.warning.mode = ALL