From: David Pursehouse Date: Fri, 27 Jan 2017 10:33:20 +0000 (+0900) Subject: RefUpdateTest: Don't call createBareRepository in try-with-resource X-Git-Tag: v4.7.0.201704051617-r~98 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ac6353e9e5fbcf0c1a298990505674077ff09a22;p=jgit.git RefUpdateTest: Don't call createBareRepository in try-with-resource createBareRepository adds the created repo to the list of repos to be closed in the superclass's teardown. Wrapping it in try-with-resource causes it to be closed too many times, resulting in a corrupt use count. Change-Id: I4c70630bf6008544324dda453deb141f4f89472c Signed-off-by: David Pursehouse --- diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefUpdateTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefUpdateTest.java index 4be1d6d370..daef91d53c 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefUpdateTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefUpdateTest.java @@ -239,14 +239,14 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { @Test public void testDeleteHeadInBareRepo() throws IOException { - try (Repository bareRepo = createBareRepository()) { - RefUpdate ref = bareRepo.updateRef(Constants.HEAD); - ref.setNewObjectId(ObjectId.fromString("0123456789012345678901234567890123456789")); - // Create the HEAD ref so we can delete it. - assertEquals(Result.NEW, ref.update()); - ref = bareRepo.updateRef(Constants.HEAD); - delete(bareRepo, ref, Result.NO_CHANGE, true, true); - } + Repository bareRepo = createBareRepository(); + RefUpdate ref = bareRepo.updateRef(Constants.HEAD); + ref.setNewObjectId(ObjectId + .fromString("0123456789012345678901234567890123456789")); + // Create the HEAD ref so we can delete it. + assertEquals(Result.NEW, ref.update()); + ref = bareRepo.updateRef(Constants.HEAD); + delete(bareRepo, ref, Result.NO_CHANGE, true, true); } /** * Delete a loose ref and make sure the directory in refs is deleted too,