From e5453b7e71b6a6cf0a85be43b75864c00de81382 Mon Sep 17 00:00:00 2001
From: alanv <alanv@labkey.com>
Date: Mon, 10 Nov 2025 16:33:44 -0600
Subject: [PATCH 1/3] CompareType::parseParams - actually allow null values
 when parsing JSONArray

---
 api/src/org/labkey/api/data/CompareType.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/api/src/org/labkey/api/data/CompareType.java b/api/src/org/labkey/api/data/CompareType.java
index 4cbd856abaa..7c92d9a2488 100644
--- 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)

From 0a5fb84f0d513751f095a865a22e123b7bfe0fcc Mon Sep 17 00:00:00 2001
From: labkey-jeckels <jeckels@labkey.com>
Date: Mon, 17 Nov 2025 17:35:46 -0800
Subject: [PATCH 2/3] Try committing whenever we wait for the queue to drain

---
 search/src/org/labkey/search/model/AbstractSearchService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/search/src/org/labkey/search/model/AbstractSearchService.java b/search/src/org/labkey/search/model/AbstractSearchService.java
index 2d54983a948..eadde97fbd9 100644
--- a/search/src/org/labkey/search/model/AbstractSearchService.java
+++ b/search/src/org/labkey/search/model/AbstractSearchService.java
@@ -222,6 +222,7 @@ public void addNoop(PRIORITY pri)
                 void complete(boolean success)
                 {
                     logQueueStatus("addNoop() complete");
+                    commit();
                     super.complete(success);
                 }
             };

From dcb64e0c2312d5be17e1da96f6c965e1f372e67f Mon Sep 17 00:00:00 2001
From: labkey-jeckels <jeckels@labkey.com>
Date: Tue, 18 Nov 2025 08:58:54 -0800
Subject: [PATCH 3/3] Log index completion too

---
 .../labkey/search/model/LuceneSearchServiceImpl.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/search/src/org/labkey/search/model/LuceneSearchServiceImpl.java b/search/src/org/labkey/search/model/LuceneSearchServiceImpl.java
index 428b5ca9a57..338f05b1bd6 100644
--- a/search/src/org/labkey/search/model/LuceneSearchServiceImpl.java
+++ b/search/src/org/labkey/search/model/LuceneSearchServiceImpl.java
@@ -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)
         {