diff options
| author | Dave Borowitz <dborowitz@google.com> | 2017-04-04 14:53:17 -0400 |
|---|---|---|
| committer | Dave Borowitz <dborowitz@google.com> | 2017-04-04 14:53:17 -0400 |
| commit | e4672d1c16c2dae3c8315c5b87abfd5aa49f3800 (patch) | |
| tree | 2cb38cd1ab6ad6fba78030aa7b620b3f251abf82 /org.eclipse.jgit | |
| parent | db58abbbe840b200c147265b440081b2c77bb72b (diff) | |
| download | jgit-e4672d1c16c2dae3c8315c5b87abfd5aa49f3800.tar.gz jgit-e4672d1c16c2dae3c8315c5b87abfd5aa49f3800.zip | |
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
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/treewalk/NameConflictTreeWalk.java | 3 |
1 files changed, 2 insertions, 1 deletions
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); } |