From 92158af52e3c438ecfef3cf3fab2126b1f77cd75 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 1 Feb 2022 11:51:32 +0100 Subject: [PATCH] reftable: close old Db in FileRepository#convertToPackedRefs This fixes test failures on Windows. Change-Id: I701fbeb99ffd7951514ae6eae8b28cceb9aebd9f --- .../eclipse/jgit/internal/storage/file/FileRepository.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java index 53a1cd639..3ebce6c40 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java @@ -665,18 +665,20 @@ void convertToPackedRefs(boolean writeLogs, boolean backup) throws IOException { if (writeLogs) { List logs = oldDb.getReflogReader(r.getName()) - .getReverseEntries(); + .getReverseEntries(); Collections.reverse(logs); for (ReflogEntry e : logs) { logWriter.log(r.getName(), e); } - } + } } try (RevWalk rw = new RevWalk(this)) { bru.execute(rw, NullProgressMonitor.INSTANCE); } + oldDb.close(); + List failed = new ArrayList<>(); for (ReceiveCommand cmd : bru.getCommands()) { if (cmd.getResult() != ReceiveCommand.Result.OK) {