Browse Source

RefDirectory#hasLooseRef: Fix stream resource leak reported by error-prone

Error-prone reports:

  [StreamResourceLeak] Streams that encapsulate a closeable resource
  should be closed using try-with-resources

Change-Id: I86154fba2b896723feaecf8991ed3c8e96ea2499
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
stable-4.11
David Pursehouse 7 years ago
parent
commit
338d0a81bb
  1. 6
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java

6
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java

@ -66,6 +66,7 @@ import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.InterruptedIOException; import java.io.InterruptedIOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path;
import java.security.DigestInputStream; import java.security.DigestInputStream;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.text.MessageFormat; import java.text.MessageFormat;
@ -78,6 +79,7 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Stream;
import org.eclipse.jgit.annotations.NonNull; import org.eclipse.jgit.annotations.NonNull;
import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.annotations.Nullable;
@ -1220,7 +1222,9 @@ public class RefDirectory extends RefDatabase {
} }
private boolean hasLooseRef() throws IOException { private boolean hasLooseRef() throws IOException {
return Files.walk(refsDir.toPath()).anyMatch(Files::isRegularFile); try (Stream<Path> stream = Files.walk(refsDir.toPath())) {
return stream.anyMatch(Files::isRegularFile);
}
} }
/** If the parent should fire listeners, fires them. */ /** If the parent should fire listeners, fires them. */

Loading…
Cancel
Save