Skip to content

CompareType: fix how parseParams parses null values in JSON arrays #7198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

CompareType: fix how parseParams parses null values in JSON arrays #7198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5453b7
CompareType::parseParams - actually allow null values when parsing JS…
labkey-alan Nov 10, 2025
0a5fb84
Try committing whenever we wait for the queue to drain
labkey-jeckels Nov 18, 2025
dcb64e0
Log index completion too
labkey-jeckels Nov 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion api/src/org/labkey/api/data/CompareType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions search/src/org/labkey/search/model/AbstractSearchService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ public void addNoop(PRIORITY pri)
void complete(boolean success)
{
logQueueStatus("addNoop() complete");
commit();
super.complete(success);
}
};
Expand Down
12 changes: 11 additions & 1 deletion search/src/org/labkey/search/model/LuceneSearchServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,17 @@ else if (owner instanceof User)
_log.debug("indexing docid: " + r.getDocumentId());
}

return index(r.getDocumentId(), doc);
boolean result = index(r.getDocumentId(), doc);

if (_log.isDebugEnabled())
{
if (_log.isTraceEnabled())
_log.trace("finished indexing " + dump(r, doc));
else
_log.debug("finished indexing docid: " + r.getDocumentId());
}

return result;
}
catch (NoClassDefFoundError err)
{
Expand Down
Loading