[FIXED JENKINS-38037] Single-arg check for executable symbols fix

Use the DescribableModel for symbols related to a meta-step when determining whether they should be parsed as having a single required argument.
jenkinsci · Sep 7, 2016 · a06779a · a06779a
1 parent f8c08e9
commit a06779a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/DSL.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/DSL.java
@@ -241,8 +241,10 @@ protected Object invokeDescribable(String symbol, Object _args) {
 
         boolean singleArgumentOnly = false;
         if (metaStep != null) {
-            DescribableModel<?> metaModel = new DescribableModel(metaStep.clazz);
-            singleArgumentOnly = metaModel.hasSingleRequiredParameter() && metaModel.getParameters().size() == 1;
+            Descriptor symbolDescriptor = SymbolLookup.get().findDescriptor(metaStep.getMetaStepArgumentType(), symbol);
+            DescribableModel<?> symbolModel = new DescribableModel(symbolDescriptor.clazz);
+
+            singleArgumentOnly = symbolModel.hasSingleRequiredParameter() && symbolModel.getParameters().size() == 1;
         }
 
         // The only time a closure is valid is when the resulting Describable is immediately executed via a meta-step