From 220cd43482c803b2e1ba6cdacc6e03644658b737 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 7 Nov 2010 20:16:15 +0100 Subject: [PATCH] [findBugs] Fix NP_LOAD_OF_KNOWN_NULL_VALUE The code analyzer can't know that passing a value known to be null is not a problem. Hence better pass null explicitly instead of the parameters being null. Change-Id: I8db6f8014de6c00dd95974d60f61ecc66191e6d4 Signed-off-by: Matthias Sohn --- .../src/org/eclipse/jgit/dircache/DirCacheCheckout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c7b9eb5db..5b71dc091 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java @@ -406,7 +406,7 @@ public class DirCacheCheckout { // File/Directory conflict case #20 if (walk.isDirectoryFileConflict()) // TODO: check whether it is always correct to report a conflict here - conflict(name, null, h, m); + conflict(name, null, null, null); // file only exists in working tree -> ignore it return;