Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
LfsProjectLocks: Open Files.list stream in try-with-resource
Change-Id: I1bd6788090a569dfbd5118205157fc124f43a88b
diff --git a/src/main/java/com/googlesource/gerrit/plugins/lfs/locks/LfsProjectLocks.java b/src/main/java/com/googlesource/gerrit/plugins/lfs/locks/LfsProjectLocks.java
index 346bdad..c9e0d28 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/lfs/locks/LfsProjectLocks.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/lfs/locks/LfsProjectLocks.java
@@ -32,6 +32,7 @@
import java.nio.file.Paths;
import java.util.Collection;
import java.util.Optional;
+import java.util.stream.Stream;
import org.eclipse.jgit.internal.storage.file.LockFile;
import org.eclipse.jgit.lfs.errors.LfsException;
import org.joda.time.DateTime;
@@ -72,8 +73,8 @@
if (!Files.exists(locksPath)) {
return;
}
- try {
- Files.list(locksPath)
+ try (Stream<Path> stream = Files.list(locksPath)) {
+ stream
.filter(Files::isRegularFile)
.forEach(
path -> {
