diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2020-02-19 01:44:47 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2020-02-19 01:45:18 +0100 |
| commit | 9e4781878b7d0a9e373b73d6e15dc0860047b183 (patch) | |
| tree | a0914eaa23f004bb5245e1fc98e3c7650da4eefd /org.eclipse.jgit.test/tst/org | |
| parent | deab5e1a43e87c46d8043add28901d3951966599 (diff) | |
| parent | 7a940542ee3fc22e66151f5a649cce4db1c30cb8 (diff) | |
| download | jgit-9e4781878b7d0a9e373b73d6e15dc0860047b183.tar.gz jgit-9e4781878b7d0a9e373b73d6e15dc0860047b183.zip | |
Merge branch 'stable-5.7'
* stable-5.7:
Update API problem filter
Prepare 5.6.2-SNAPSHOT builds
JGit v5.6.1.202002131546-r
Simplify ReftableCompactor
Change-Id: I1aa650e030fbaa7a1c898eef1836de529e0c30db
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.test/tst/org')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/ReftableCompactorTest.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/ReftableCompactorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/ReftableCompactorTest.java index 874bab75ad..6fc7f25475 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/ReftableCompactorTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/ReftableCompactorTest.java @@ -19,7 +19,9 @@ import static org.junit.Assert.assertTrue; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import org.eclipse.jgit.internal.storage.io.BlockSource; import org.eclipse.jgit.internal.storage.reftable.ReftableWriter.Stats; @@ -63,7 +65,9 @@ public class ReftableCompactorTest { ReftableCompactor compactor; try (ByteArrayOutputStream outBuf = new ByteArrayOutputStream()) { compactor = new ReftableCompactor(outBuf); - compactor.tryAddFirst(read(inTab)); + List<ReftableReader> readers = new ArrayList<>(); + readers.add(read(inTab)); + compactor.addAll(readers); compactor.compact(); outTab = outBuf.toByteArray(); } |