From e4672d1c16c2dae3c8315c5b87abfd5aa49f3800 Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Tue, 4 Apr 2017 14:53:17 -0400 Subject: [PATCH] NameConflictTreeWalk: Mark repo param @Nullable This is passed directly to the super constructor, where it is also @Nullable. Marking it here saves the reader a jump. Change-Id: Icc8db2f2dc6aae6e591aa4f09a3c283336a5424c --- .../src/org/eclipse/jgit/treewalk/NameConflictTreeWalk.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/NameConflictTreeWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/NameConflictTreeWalk.java index c0b29ef930..59cf7989d4 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/NameConflictTreeWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/NameConflictTreeWalk.java @@ -45,6 +45,7 @@ package org.eclipse.jgit.treewalk; import java.io.IOException; +import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.dircache.DirCacheBuilder; import org.eclipse.jgit.errors.CorruptObjectException; import org.eclipse.jgit.lib.FileMode; @@ -110,7 +111,7 @@ public class NameConflictTreeWalk extends TreeWalk { * the reader the walker will obtain tree data from. * @since 4.3 */ - public NameConflictTreeWalk(Repository repo, final ObjectReader or) { + public NameConflictTreeWalk(@Nullable Repository repo, final ObjectReader or) { super(repo, or); } -- 2.39.5