From de80c3e40976fef5bb171e7ec03d097b4bccb218 Mon Sep 17 00:00:00 2001
From: XingY <xyang@labkey.com>
Date: Mon, 28 Jul 2025 15:06:17 -0700
Subject: [PATCH] Issue 53536: LKSM/LKB: Moving assay runs with multiple file
 fields may populate file fields incorrectly

---
 api/src/org/labkey/api/assay/AbstractAssayProvider.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/api/src/org/labkey/api/assay/AbstractAssayProvider.java b/api/src/org/labkey/api/assay/AbstractAssayProvider.java
index 423c76b42c7..2ccef55dff7 100644
--- a/api/src/org/labkey/api/assay/AbstractAssayProvider.java
+++ b/api/src/org/labkey/api/assay/AbstractAssayProvider.java
@@ -2169,10 +2169,11 @@ private void updateResultFiles(FilteredTable assayResultTable, List<ExpRun> runs
         Map<Integer, ExpRun> runMap = new HashMap<>();
         runs.forEach(run -> runMap.put(run.getRowId(), run));
 
-        Map<String, AssayFileMoveReference> fileMoveReferences = new HashMap<>();
-        Map<String, List<Integer>> fileMoveResultRowIds = new HashMap<>();
         for (String fileField : fileFields)
         {
+            Map<String, AssayFileMoveReference> fileMoveReferences = new HashMap<>();
+            Map<String, List<Integer>> fileMoveResultRowIds = new HashMap<>();
+
             var fileColumn = assayResultTable.getColumn(fileField);
             TableSelector ts = new TableSelector(assayResultTable, assayResultTable.getColumns("rowid", "run", fileField), filter, null);
             Map<String, Object>[] resultFiles = ts.getMapArray();