Oops, contradictory annotations!

jglick · jglick · commit fec21a8cefa6 · 2019-04-24T11:38:33.000-04:00
diff --git a/src/main/java/org/jenkinsci/plugins/docker/workflow/client/DockerClient.java b/src/main/java/org/jenkinsci/plugins/docker/workflow/client/DockerClient.java
@@ -276,7 +276,7 @@ private LaunchResult launch(@Nonnull EnvVars launchEnv, boolean quiet, @Nonnull
     private LaunchResult launch(@Nonnull EnvVars launchEnv, boolean quiet, FilePath pwd, @Nonnull String... args) throws IOException, InterruptedException {
         return launch(launchEnv, quiet, pwd, new ArgumentListBuilder(args));
     }
-    private LaunchResult launch(@CheckForNull @Nonnull EnvVars launchEnv, boolean quiet, FilePath pwd, @Nonnull ArgumentListBuilder args) throws IOException, InterruptedException {
+    private LaunchResult launch(@Nonnull EnvVars launchEnv, boolean quiet, FilePath pwd, @Nonnull ArgumentListBuilder args) throws IOException, InterruptedException {
         // Prepend the docker command
         args.prepend(DockerTool.getExecutable(toolName, node, launcher.getListener(), launchEnv));
 

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ private LaunchResult launch(@Nonnull EnvVars launchEnv, boolean quiet, @Nonnull`
`276`	`276`	`private LaunchResult launch(@Nonnull EnvVars launchEnv, boolean quiet, FilePath pwd, @Nonnull String... args) throws IOException, InterruptedException {`
`277`	`277`	`return launch(launchEnv, quiet, pwd, new ArgumentListBuilder(args));`
`278`	`278`	`}`
`279`		`- private LaunchResult launch(@CheckForNull @Nonnull EnvVars launchEnv, boolean quiet, FilePath pwd, @Nonnull ArgumentListBuilder args) throws IOException, InterruptedException {`
	`279`	`+ private LaunchResult launch(@Nonnull EnvVars launchEnv, boolean quiet, FilePath pwd, @Nonnull ArgumentListBuilder args) throws IOException, InterruptedException {`
`280`	`280`	`// Prepend the docker command`
`281`	`281`	`args.prepend(DockerTool.getExecutable(toolName, node, launcher.getListener(), launchEnv));`
`282`	`282`