[FIXED JENKINS-43816] Make sure we have a non-null execution.

jenkinsci · May 19, 2017 · 81240a2 · 81240a2
1 parent cde871f
commit 81240a2
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/...on/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/Converter.groovy b/...on/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/Converter.groovy
@@ -49,6 +49,7 @@ import org.jenkinsci.plugins.workflow.job.WorkflowRun
 
 import java.security.CodeSource
 import java.security.cert.Certificate
+import java.util.concurrent.TimeUnit
 
 import static groovy.lang.GroovyShell.DEFAULT_CODE_BASE
 import static org.codehaus.groovy.control.Phases.CANONICALIZATION
@@ -201,12 +202,14 @@ public class Converter {
      * @param run The {@link WorkflowRun} to pull from.
      * @return A parsed and validated {@link ModelASTPipelineDef}
      */
-    public static ModelASTPipelineDef parseFromWorkflowRun(WorkflowRun run) {
-        CpsFlowExecution execution = Utils.getExecutionForRun(run)
-
-        String rawScript = execution.script
-
-        return scriptToPipelineDef(rawScript)
+    public static ModelASTPipelineDef parseFromWorkflowRun(WorkflowRun run) throws Exception {
+        CpsFlowExecution execution = null
+        if (run.execution != null) {
+            execution = (CpsFlowExecution) run.execution
+        } else if (run.getExecutionPromise() != null) {
+            execution = (CpsFlowExecution) run.getExecutionPromise().get(2, TimeUnit.SECONDS)
+        }
+        return scriptToPipelineDef(execution.script)
     }
 
 }