CompareType::parseParams - actually allow null values when parsing JSONArray

labkey-alan · labkey-alan · commit e5453b7e71b6 · 2025-11-17T12:06:01.000-06:00
diff --git a/api/src/org/labkey/api/data/CompareType.java b/api/src/org/labkey/api/data/CompareType.java
@@ -24,6 +24,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.json.JSONArray;
 import org.json.JSONException;
+import org.json.JSONObject;
 import org.junit.Assert;
 import org.junit.Test;
 import org.labkey.api.collections.CaseInsensitiveHashSet;
@@ -984,7 +985,8 @@ protected static void parseParams(String value, String separator, Collection<Str
                     JSONArray array = new JSONArray(value);
                     for (int i = 0; i < array.length(); i++)
                     {
-                        collection.add(Objects.toString(array.get(i), null));
+                        Object jsonVal = array.get(i);
+                        collection.add(JSONObject.NULL.equals(jsonVal) ? null : Objects.toString(jsonVal));
                     }
                 }
                 catch (JSONException ex)

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`import org.jetbrains.annotations.Nullable;`
`25`	`25`	`import org.json.JSONArray;`
`26`	`26`	`import org.json.JSONException;`
	`27`	`+import org.json.JSONObject;`
`27`	`28`	`import org.junit.Assert;`
`28`	`29`	`import org.junit.Test;`
`29`	`30`	`import org.labkey.api.collections.CaseInsensitiveHashSet;`
`@@ -984,7 +985,8 @@ protected static void parseParams(String value, String separator, Collection<Str`
`984`	`985`	`JSONArray array = new JSONArray(value);`
`985`	`986`	`for (int i = 0; i < array.length(); i++)`
`986`	`987`	`{`
`987`		`- collection.add(Objects.toString(array.get(i), null));`
	`988`	`+ Object jsonVal = array.get(i);`
	`989`	`+ collection.add(JSONObject.NULL.equals(jsonVal) ? null : Objects.toString(jsonVal));`
`988`	`990`	`}`
`989`	`991`	`}`
`990`	`992`	`catch (JSONException ex)`