motiejus
/
jgit
1
Fork 0
Code Releases Activity

reftable: close old Db in FileRepository#convertToPackedRefs 

This fixes test failures on Windows.

Change-Id: I701fbeb99ffd7951514ae6eae8b28cceb9aebd9f
This commit is contained in:
Han-Wen Nienhuys 2022-02-01 11:51:32 +01:00
parent a650ae8ad3
commit 92158af52e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java
View File

@ -665,18 +665,20 @@ void convertToPackedRefs(boolean writeLogs, boolean backup) throws IOException {
if (writeLogs) { if (writeLogs) {
List<ReflogEntry> logs = oldDb.getReflogReader(r.getName()) List<ReflogEntry> logs = oldDb.getReflogReader(r.getName())
.getReverseEntries(); .getReverseEntries();
Collections.reverse(logs); Collections.reverse(logs);
for (ReflogEntry e : logs) { for (ReflogEntry e : logs) {
logWriter.log(r.getName(), e); logWriter.log(r.getName(), e);
} }
} }
} }
try (RevWalk rw = new RevWalk(this)) { try (RevWalk rw = new RevWalk(this)) {
bru.execute(rw, NullProgressMonitor.INSTANCE); bru.execute(rw, NullProgressMonitor.INSTANCE);
} }
oldDb.close();
List<String> failed = new ArrayList<>(); List<String> failed = new ArrayList<>();
for (ReceiveCommand cmd : bru.getCommands()) { for (ReceiveCommand cmd : bru.getCommands()) {
if (cmd.getResult() != ReceiveCommand.Result.OK) { if (cmd.getResult() != ReceiveCommand.Result.OK) {