diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2014-02-28 07:15:08 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2014-02-28 10:44:54 +0100 |
| commit | 7b01a5369210ef68dd2934db72861b3145495d3f (patch) | |
| tree | 4959f05d613f2398b6a0f7f8f4d0633b815dbefe /org.eclipse.jgit.java7.test | |
| parent | 2670fd427cd4aad49ccdb6dde66271fdffff86f8 (diff) | |
| download | jgit-7b01a5369210ef68dd2934db72861b3145495d3f.tar.gz jgit-7b01a5369210ef68dd2934db72861b3145495d3f.zip | |
Fix NPE when WorkingTreeIterator does not have a repository set
It's strange that we have that member since it is not so clear
when it it set or not.
Change-Id: I53903a264f46866d249901a3cd9f9295028aa6bd
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.java7.test')
| -rw-r--r-- | org.eclipse.jgit.java7.test/src/org/eclipse/jgit/treewalk/FileTreeIteratorJava7Test.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/org.eclipse.jgit.java7.test/src/org/eclipse/jgit/treewalk/FileTreeIteratorJava7Test.java b/org.eclipse.jgit.java7.test/src/org/eclipse/jgit/treewalk/FileTreeIteratorJava7Test.java index 484467b24c..2b2d65e9b1 100644 --- a/org.eclipse.jgit.java7.test/src/org/eclipse/jgit/treewalk/FileTreeIteratorJava7Test.java +++ b/org.eclipse.jgit.java7.test/src/org/eclipse/jgit/treewalk/FileTreeIteratorJava7Test.java @@ -114,7 +114,8 @@ public class FileTreeIteratorJava7Test extends RepositoryTestCase { assertEquals("link", dci.getEntryPathString()); // test - assertFalse(fti.isModified(dci.getDirCacheEntry(), true)); + assertFalse(fti.isModified(dci.getDirCacheEntry(), true, + db.newObjectReader())); } /** @@ -195,6 +196,7 @@ public class FileTreeIteratorJava7Test extends RepositoryTestCase { assertEquals("link", dci.getEntryPathString()); // test - assertTrue(fti.isModified(dci.getDirCacheEntry(), true)); + assertTrue(fti.isModified(dci.getDirCacheEntry(), true, + db.newObjectReader())); } } |