FilePath.toComputer no worse than what we already are doing in onChec…

…kout, though JENKINS-26096 suggests improvements. Originally-Committed-As: 5b778564c2f52397592e7c6ca5e5db2bf0452294
jenkinsci · Mar 19, 2015 · 83ea9d9 · 83ea9d9
1 parent a63c3ee
commit 83ea9d9
Showing 1 changed file with 4 additions and 13 deletions.
diff --git a/job/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowRun.java b/job/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowRun.java
@@ -511,21 +511,12 @@ private void onCheckout(SCM scm, FilePath workspace, @CheckForNull File changelo
                 l.onChangeLogParsed(this, scm, listener, cls);
             }
         }
-        String node = null;
-        // TODO: switch to FilePath.toComputer in 1.571
-        Jenkins j = Jenkins.getInstance();
-        if (j != null) {
-            for (Computer c : j.getComputers()) {
-                if (workspace.getChannel() == c.getChannel()) {
-                    node = c.getName();
-                    break;
-                }
-            }
-        }
-        if (node == null) {
+        // TODO JENKINS-26096 prefer a variant returning only Computer.name even if offline
+        Computer computer = workspace.toComputer();
+        if (computer == null) {
             throw new IllegalStateException();
         }
-        checkouts.add(new SCMCheckout(scm, node, workspace.getRemote(), changelogFile, pollingBaseline));
+        checkouts.add(new SCMCheckout(scm, computer.getName(), workspace.getRemote(), changelogFile, pollingBaseline));
     }
 
     static final class SCMCheckout {