From 56634de0cc3b0fd0d66bd867210e7e2d74451cea Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 14 Jan 2016 15:06:10 +0900 Subject: [PATCH] RefUpdateTest: Add null check to prevent potential NPE Change-Id: I64b1850c3bb80b09409044461ca3fdde1c46d4bb Signed-off-by: David Pursehouse --- .../org/eclipse/jgit/internal/storage/file/RefUpdateTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8744ed1bd..4ae92ccbe 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 @@ -751,7 +751,7 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { assertNull(db.resolve(toName)); assertEquals(oldFromLog.toString(), db.getReflogReader(fromName) .getReverseEntries().toString()); - if (oldHeadId != null) + if (oldHeadId != null && oldHeadLog != null) assertEquals(oldHeadLog.toString(), db.getReflogReader( Constants.HEAD).getReverseEntries().toString()); } finally {