From 2a5b79bf49901ee9df2625f9710abf1ef7cbdb51 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Mon, 26 May 2025 11:35:42 -0700 Subject: [PATCH 1/2] Add forUpdate parameter to more methods that are getting domains --- snd/src/org/labkey/snd/query/PackagesTable.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/snd/src/org/labkey/snd/query/PackagesTable.java b/snd/src/org/labkey/snd/query/PackagesTable.java index fc9686b9d..4330748a9 100644 --- a/snd/src/org/labkey/snd/query/PackagesTable.java +++ b/snd/src/org/labkey/snd/query/PackagesTable.java @@ -18,7 +18,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.labkey.api.data.Container; -import org.labkey.api.data.ContainerFilter; import org.labkey.api.data.DbScope; import org.labkey.api.data.JdbcType; import org.labkey.api.data.SQLFragment; @@ -150,7 +149,7 @@ public List> insertRows(User user, Container container, List try { - DomainUtil.createDomain(PackageDomainKind.getPackageKindName(), newDomain, null, container, user, null, null); + DomainUtil.createDomain(PackageDomainKind.getPackageKindName(), newDomain, null, container, user, null, null, false); } catch (ValidationException ve) { From 4a2cf57cf4bc1a499ce1712f17fda1a8ea4cabf2 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Wed, 28 May 2025 10:42:37 -0700 Subject: [PATCH 2/2] Still more forUpdate parameters --- ehr/src/org/labkey/ehr/EHRManager.java | 1 + 1 file changed, 1 insertion(+) diff --git a/ehr/src/org/labkey/ehr/EHRManager.java b/ehr/src/org/labkey/ehr/EHRManager.java index 3d6f85c90..724110f07 100644 --- a/ehr/src/org/labkey/ehr/EHRManager.java +++ b/ehr/src/org/labkey/ehr/EHRManager.java @@ -488,6 +488,7 @@ public List ensureDatasetPropertyDescriptors(Container c, User u, boolea messages.add("Missing property \"" + pd.getName() + "\" on dataset: " + dataset.getName() + ". Needs to be created."); if (commitChanges) { + domain = dataset.getDomain(true); DomainProperty d = domain.addProperty(); d.setPropertyURI(pd.getPropertyURI()); d.setRangeURI(pd.getRangeURI());