Skip to content

Commit 261a871

Browse files
committed
Dont close transaction in MCC
1 parent 74e4c21 commit 261a871

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

mcc/src/org/labkey/mcc/query/TriggerHelper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import java.util.HashSet;
4848
import java.util.List;
4949
import java.util.Map;
50+
import java.util.Objects;
5051
import java.util.Set;
5152
import java.util.concurrent.atomic.AtomicInteger;
5253
import java.util.stream.Collectors;
@@ -299,7 +300,7 @@ private TableInfo getMappingTable()
299300

300301
public int ensureMccAliasExists(Collection<String> rawIds, Map<Object, Object> existingAliases)
301302
{
302-
if (!DbScope.getLabKeyScope().isTransactionActive())
303+
if (DbScope.getLabKeyScope().getCurrentTransaction() != null && Objects.requireNonNull(DbScope.getLabKeyScope().getCurrentTransaction()).isAborted())
303304
{
304305
_log.info("No active transaction, skipping MCC ensureMccAliasExists()");
305306
return 0;

0 commit comments

Comments
 (0)