Make WorkflowJob.submit honor overrides of FlowDefinitionDescriptor.n…

…ewInstance
jenkinsci · May 4, 2022 · a25d155 · a25d155
1 parent 04c4e75
commit a25d155
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowJob.java b/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowJob.java
@@ -180,7 +180,11 @@ public void setDefinition(FlowDefinition definition) {
     @Override protected void submit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, Descriptor.FormException {
         super.submit(req, rsp);
         JSONObject json = req.getSubmittedForm();
-        definition = req.bindJSON(FlowDefinition.class, json.getJSONObject("definition"));
+        // TODO: Switch from Descriptor.newInstancesFromHeteroList to Descriptor.bindJSON when minimum supported
+        //  version is Jenkins 2.342 or higher.
+        definition = json.get("definition") == null ? null :
+                Descriptor.newInstancesFromHeteroList(req, json.getJSONObject("definition"),
+                        ExtensionList.lookup(FlowDefinitionDescriptor.class)).get(0);
         authToken = hudson.model.BuildAuthorizationToken.create(req);
 
         if (req.getParameter("hasCustomQuietPeriod") != null) {