motiejus
/
jgit
1
Fork 0
Code Releases Activity

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>
This commit is contained in:
Terry Parker 2015-11-09 13:42:20 -08:00
parent 3a3bb2ce29
commit 6ddb8e703b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
View File

@ -65,7 +65,7 @@
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 @@ protected static File searchPath(final String path, final String... lookFor) {
* 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 @@ protected static String readPipe(File dir, String[] command, String encoding) {
* @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