Fix null ref exception in DirCacheCheckout

Added missing null check for getDirCacheEntry(). This method may
return null for example if the curernt entry is a subtree.

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
index 5b71dc091fc22c4df3edb383dddd1e8884a5856e..bc51aa55a28c39f956de39262268cc1e0a27392f 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
@@ -274,8 +274,9 @@ public class DirCacheCheckout {
                        WorkingTreeIterator f) {
                if (m != null) {
                        if (i == null || f == null || !m.idEqual(i)
-                                       || f.isModified(i.getDirCacheEntry(), true,
-                                                       config_filemode(), repo.getFS())) {
+                                       || (i.getDirCacheEntry() != null && f.isModified(i
+                                                       .getDirCacheEntry(), true, config_filemode(), repo
+                                                       .getFS()))) {
                                update(m.getEntryPathString(), m.getEntryObjectId(),
                                                m.getEntryFileMode());
                        } else