Merge pull request #73 from svanoort/fix-flowexecutionowner-lazyload

Fix [JENKINS-50784] by using a blocking load of execution where needed
jenkinsci · Apr 20, 2018 · bd2a61f · bd2a61f
2 parents 60845a3 + 43f130c
commit bd2a61f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/multibranch/JobPropertyStep.java b/src/main/java/org/jenkinsci/plugins/workflow/multibranch/JobPropertyStep.java
@@ -101,7 +101,7 @@ public static class Execution extends AbstractSynchronousStepExecution<Void> {
                     FlowExecutionOwner owner = ((FlowExecutionOwner.Executable) previousRun).asFlowExecutionOwner();
 
                     if (owner != null) {
-                        FlowExecution execution = owner.getOrNull();
+                        FlowExecution execution = owner.get();
                         if (execution != null) {
                             previousHadStep = new DepthFirstScanner().findFirstMatch(execution,
                                     new NodeStepTypePredicate(step.getDescriptor())) != null;