diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2014-03-01 12:44:34 +0100 |
|---|---|---|
| committer | Robin Rosenberg <robin.rosenberg@dewire.com> | 2014-03-01 13:02:06 +0100 |
| commit | abff667d40dc520e70fe72702159b6f4985d014b (patch) | |
| tree | 75e1e11cf84f0112663f0516722e632e3888099c /org.eclipse.jgit/src/org/eclipse | |
| parent | 5de70c6fab9e832e7905c289c057bc8d00bf0d94 (diff) | |
| download | jgit-abff667d40dc520e70fe72702159b6f4985d014b.tar.gz jgit-abff667d40dc520e70fe72702159b6f4985d014b.zip | |
Avoid an NPE after 7b01a5369210
While fixing an NPE, I introduced another one in a deprecated isModified
method. It cannot avoid NPE's entirely, which is the reason the method
is deprecated
Change-Id: I5147c1c94621586dd84bd11e6090a954523b6c1c
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java index 2476e57ecf..2dd784fe7f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java @@ -803,7 +803,8 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator { */ public boolean isModified(DirCacheEntry entry, boolean forceContentCheck) { try { - return isModified(entry, forceContentCheck, null); + return isModified(entry, forceContentCheck, + repository.newObjectReader()); } catch (IOException e) { throw new JGitInternalException(e.getMessage(), e); } |