Merge pull request #145 from jglick/StepContext-FlowNode

A call to get(FlowNode) need not wait for the CpsThread
jenkinsci · Jun 16, 2017 · 9995a33 · 9995a33
2 parents 780ef90 + cabca49
commit 9995a33
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java
@@ -291,6 +291,10 @@ public CpsBodyInvoker newBodyInvoker() {
 
     @Override
     protected <T> T doGet(Class<T> key) throws IOException, InterruptedException {
+        if (FlowNode.class.isAssignableFrom(key)) {
+            return key.cast(getNode());
+        }
+
         CpsThread t = getThreadSynchronously();
         if (t == null) {
             throw new IOException("cannot find current thread");
@@ -299,9 +303,6 @@ protected <T> T doGet(Class<T> key) throws IOException, InterruptedException {
         T v = t.getContextVariable(key);
         if (v!=null)        return v;
 
-        if (FlowNode.class.isAssignableFrom(key)) {
-            return key.cast(getNode());
-        }
         if (key == CpsThread.class) {
             return key.cast(t);
         }