Skip to content

Commit a943713

Browse files
committed
LibraryConfiguration.java: extractDefaultedVersionSCMFS(): avoid redundant null-checks (spotbugs) [JENKINS-69731]
1 parent b95c46a commit a943713

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryConfiguration.java

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,7 @@ private String extractDefaultedVersionGitSCM(@NonNull SCM scm, @NonNull Run<?, ?
338338

339339
private String extractDefaultedVersionSCMFS(@NonNull SCM scm, @NonNull Run<?, ?> run, @NonNull TaskListener listener, PrintStream logger) {
340340
String runVersion = null;
341-
Item runParent = run.getParent();
342-
if (runParent == null)
343-
return null;
341+
Item runParent = run.getParent(); // never returns null
344342

345343
SCMFileSystem fs;
346344
try {
@@ -370,15 +368,7 @@ private String extractDefaultedVersionSCMFS(@NonNull SCM scm, @NonNull Run<?, ?>
370368
return null;
371369
}
372370

373-
SCMHead head = rev.getHead();
374-
if (head == null) {
375-
if (logger != null) {
376-
logger.println("defaultedVersion(): " +
377-
"got no SCMHead of SCMRevision from SCMFileSystem");
378-
}
379-
return null;
380-
}
381-
371+
SCMHead head = rev.getHead(); // never returns null
382372
if (logger != null) {
383373
logger.println("defaultedVersion(): " +
384374
"got SCMHead of SCMRevision from SCMFileSystem: " +

0 commit comments

Comments
 (0)