Merge pull request #42 from jglick/ChoiceParameterDefinition-JENKINS-…

…53917 [JENKINS-53917] Reverting #41 as it broke binding of ChoiceParameterDefinition in scripts
jenkinsci · Oct 5, 2018 · 6fb2693 · 6fb2693
2 parents 812bb77 + e8a0cc6
commit 6fb2693
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/plugin/src/main/java/org/jenkinsci/plugins/structs/describable/DescribableModel.java b/plugin/src/main/java/org/jenkinsci/plugins/structs/describable/DescribableModel.java
@@ -177,10 +177,6 @@ public DescribableModel(Class<T> clazz) {
     }
 
     private void addParameter(Map<String,DescribableParameter> props, Type type, String name, Setter setter) {
-        if (type == Object.class) {
-            // For example, ChoiceParameterDefinition.choices is just not analyzable.
-            return;
-        }
         props.put(name, new DescribableParameter(this, type, name, setter));
     }