diff options
| author | Terry Parker <tparker@google.com> | 2015-11-09 13:42:20 -0800 |
|---|---|---|
| committer | Terry Parker <tparker@google.com> | 2015-11-09 14:27:52 -0800 |
| commit | 6ddb8e703bae2a74287bb5ac7ae94460324766cf (patch) | |
| tree | 5c6901519b875fc42b5b70ae3a0550b71e73a44c | |
| parent | 3a3bb2ce292fcfb8ad34408d2ac7106d05ba642f (diff) | |
| download | jgit-6ddb8e703bae2a74287bb5ac7ae94460324766cf.tar.gz jgit-6ddb8e703bae2a74287bb5ac7ae94460324766cf.zip | |
Use the JGit-internal @Nullable annotation
Update existing @Nullable uses to use the JGit-internal version of the
annotation.
Change-Id: I95234ffad4c3110f9597fbd3a2760f653e22ecf7
Signed-off-by: Terry Parker <tparker@google.com>
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java index bcaf62a0c4..e407dd8be9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java @@ -65,7 +65,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.eclipse.jdt.annotation.Nullable; +import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.api.errors.JGitInternalException; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.lib.Constants; @@ -404,7 +404,8 @@ public abstract class FS { * as component array * @param encoding * to be used to parse the command's output - * @return the one-line output of the command + * @return the one-line output of the command or {@code null} if there is + * none */ @Nullable protected static String readPipe(File dir, String[] command, String encoding) { @@ -423,7 +424,8 @@ public abstract class FS { * @param env * Map of environment variables to be merged with those of the * current process - * @return the one-line output of the command + * @return the one-line output of the command or {@code null} if there is + * none * @since 4.0 */ @Nullable |