From c745c93e40abdad7afde4e3b48dbb11469916112 Mon Sep 17 00:00:00 2001 From: Christian Halstrick Date: Sat, 16 Jun 2012 00:06:50 +0200 Subject: [PATCH] Fix LockFileTest on Windows LockFileTest was failing on Windows because we couldn't delete the lock file of the index. The reason was that a LockFile instance still had an open handle to the lock file preventing us to delete the file (in contrast to the behavior on other platforms). Change-Id: I1d50442b7eb8a27f98f69ad77c5e24a9698a7b66 Signed-off-by: Christian Halstrick Signed-off-by: Matthias Sohn --- .../tst/org/eclipse/jgit/storage/file/LockFileTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/LockFileTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/LockFileTest.java index 57770d322..7c76f9de8 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/LockFileTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/LockFileTest.java @@ -70,13 +70,14 @@ public class LockFileTest extends RepositoryTestCase { git.add().addFilepattern("file.txt").call(); assertNotNull(git.commit().setMessage("edit file").call()); - assertTrue(new LockFile(db.getIndexFile(), db.getFS()).lock()); + LockFile lf = new LockFile(db.getIndexFile(), db.getFS()); + assertTrue(lf.lock()); try { git.checkout().setName(commit1.name()).call(); fail("JGitInternalException not thrown"); } catch (JGitInternalException e) { assertTrue(e.getCause() instanceof LockFailedException); - LockFile.unlock(((LockFailedException) e.getCause()).getFile()); + lf.unlock(); git.checkout().setName(commit1.name()).call(); } }