diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2010-11-07 20:16:15 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2010-11-07 20:16:15 +0100 |
| commit | 220cd43482c803b2e1ba6cdacc6e03644658b737 (patch) | |
| tree | 0fab7794aeb0aefb135585e41c29b75a85400940 | |
| parent | 0e815fe8c5bd7fb4de9d82b9d25d8ad9a9ec32c4 (diff) | |
| download | jgit-220cd43482c803b2e1ba6cdacc6e03644658b737.tar.gz jgit-220cd43482c803b2e1ba6cdacc6e03644658b737.zip | |
[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 <matthias.sohn@sap.com>
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 c7b9eb5db0..5b71dc091f 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; |