[JENKINS-40477] - get rid of ClassCastException

jenkinsci · Feb 22, 2017 · 550a456 · jglick · Feb 22, 2017 · fredg02
1 parent c6211d0
commit 550a456
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/main/java/jenkins/plugins/extracolumns/LastBuildNodeColumn.java b/src/main/java/jenkins/plugins/extracolumns/LastBuildNodeColumn.java
@@ -25,6 +25,7 @@
 
 import jenkins.model.Jenkins;
 
+import org.jenkinsci.plugins.workflow.job.WorkflowRun;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 import hudson.Extension;
@@ -44,14 +45,16 @@ public LastBuildNodeColumn() {
 
     public String getLastBuildNode(Job<?, ?> job) {
         Run<?, ?> lastBuild = job.getLastBuild();
-        if (lastBuild == null) {
+        if (lastBuild == null || lastBuild instanceof WorkflowRun) {
             return null;
+        } else if (lastBuild instanceof AbstractBuild<?, ?>) {
+            Node builtOn = ((AbstractBuild<?, ?>) lastBuild).getBuiltOn();
+            if (builtOn instanceof Jenkins) {
+                return "master";
+            }
+            return builtOn.getDisplayName();
         }
-        Node builtOn = ((AbstractBuild<?, ?>) lastBuild).getBuiltOn();
-        if (builtOn instanceof Jenkins) {
-            return "master";
-        }
-        return builtOn.getDisplayName();
+        return null;
     }
 
     @Extension