Merge remote-tracking branch 'origin/develop' into fb_deriveActions

Author: labkey-susanh

api/src/org/labkey/api/reader/DataLoader.java

@@ -729,6 +729,7 @@ protected final Map<String, Object> convertValues(Object[] fields)
                 boolean foundData = false;
                 for (int i = 0; i < _activeColumns.length; i++)
                 {
+                    boolean isEmptyArray = false;
                     ColumnDescriptor column = _activeColumns[i];
                     if (_preserveEmptyString && null == column.missingValues)
                     {
@@ -831,6 +832,12 @@ else if (column.clazz == MultiChoice.Array.class)
                             // GitHub Issue 925: Not providing a MVTC value in an assay result throws error
                             // convert blank to empty array, not null
                             values[i] = column.converter.convert(column.clazz, fld);
+                            if (values[i] instanceof MultiChoice.Array array) // TODO: make this more generic? instanceof List and/or instanceof java.sql.Array?
+                            {
+                                // If line is blank, array will be empty array instead of null
+                                if (array.isEmpty())
+                                    isEmptyArray = true;
+                            }
                         }
                         else
                         {
@@ -878,7 +885,7 @@ else if (ERROR_VALUE_USE_ORIGINAL.equals(column.errorValues))
                             values[i] = column.errorValues;
                     }
 
-                    if (values[i] != null)
+                    if (values[i] != null && !isEmptyArray)
                         foundData = true;
                 }