Account for JSONObject.NULL

bbimber · bbimber · commit e455dc6393c2 · 2023-05-31T13:19:04.000-07:00
diff --git a/SequenceAnalysis/api-src/org/labkey/api/sequenceanalysis/pipeline/ToolParameterDescriptor.java b/SequenceAnalysis/api-src/org/labkey/api/sequenceanalysis/pipeline/ToolParameterDescriptor.java
@@ -200,7 +200,7 @@ public <ParamType> ParamType extractValue(PipelineJob job, PipelineStepProvider<
             jobParams = new JSONObject(job.getParameters());
         }
 
-        if (jobParams.has(key))
+        if (jobParams.has(key) && !jobParams.isNull(key))
         {
             Object val = jobParams.get(key);
             if (val == JSONObject.NULL) {

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ public <ParamType> ParamType extractValue(PipelineJob job, PipelineStepProvider<`
`200`	`200`	`jobParams = new JSONObject(job.getParameters());`
`201`	`201`	`}`
`202`	`202`
`203`		`- if (jobParams.has(key))`
	`203`	`+ if (jobParams.has(key) && !jobParams.isNull(key))`
`204`	`204`	`{`
`205`	`205`	`Object val = jobParams.get(key);`
`206`	`206`	`if (val == JSONObject.NULL) {`