aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXing Huang <xingkhuang@google.com>2023-03-21 17:27:49 -0500
committerMatthias Sohn <matthias.sohn@sap.com>2023-03-23 08:19:26 +0100
commit3212c8fa387995cecbb95de50508ba142f772203 (patch)
tree52fe2e9138d385a5d2e94c218c3196bd9cd1928c
parentd9f75e8bb2af7307ce1d6e0a7376eb5ebe583ae4 (diff)
downloadjgit-3212c8fa387995cecbb95de50508ba142f772203.tar.gz
jgit-3212c8fa387995cecbb95de50508ba142f772203.zip
GC: Close File.lines stream
From File#lines javadoc: The returned stream from File Lines encapsulates a Reader. If timely disposal of file system resources is required, the try-with-resources construct should be used to ensure that the stream's close method is invoked after the stream operations are completed. Wrap File.lines with try-with-resources. Change-Id: I82c6faa3ef1083f6c7e964f96e9540b4db18eee8 Signed-off-by: Xing Huang <xingkhuang@google.com> (cherry picked from commit 172a207945da376b6b4143305aef2af56f7c42e2)
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java
index f25feee8f5..4fc9582d33 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java
@@ -1683,8 +1683,9 @@ public class GC {
private void gcAlreadyRunning() {
close();
- try {
- Optional<String> s = Files.lines(pidFile).findFirst();
+ Optional<String> s;
+ try (Stream<String> lines = Files.lines(pidFile)) {
+ s = lines.findFirst();
String machine = null;
String pid = null;
if (s.isPresent()) {