Merge pull request #278 from jglick/DefaultStepContext-FlowNode

Use DefaultStepContext simplification
jenkinsci · Apr 26, 2019 · 62fb226 · 62fb226
2 parents bab0f68 + 838d6cf
commit 62fb226
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -68,7 +68,7 @@
         <java.level>8</java.level>
         <no-test-jar>false</no-test-jar>
         <git-plugin.version>3.1.0</git-plugin.version>
-        <workflow-support-plugin.version>3.2</workflow-support-plugin.version>
+        <workflow-support-plugin.version>3.3</workflow-support-plugin.version>
         <scm-api-plugin.version>2.2.6</scm-api-plugin.version>
         <groovy-cps.version>1.27</groovy-cps.version>
         <structs-plugin.version>1.17</structs-plugin.version>

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,10 +291,6 @@ 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");