Add forUpdate parameter to more methods that are getting domains (#962)

labkey-susanh · web-flow · commit 43e763360400 · 2025-06-04T07:36:20.000-07:00
diff --git a/ehr/src/org/labkey/ehr/EHRManager.java b/ehr/src/org/labkey/ehr/EHRManager.java
@@ -488,6 +488,7 @@ public List<String> 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());
diff --git 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<Map<String, Object>> 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)
                 {

Original file line number	Diff line number	Diff line change
`@@ -488,6 +488,7 @@ public List<String> ensureDatasetPropertyDescriptors(Container c, User u, boolea`
`488`	`488`	`messages.add("Missing property \"" + pd.getName() + "\" on dataset: " + dataset.getName() + ". Needs to be created.");`
`489`	`489`	`if (commitChanges)`
`490`	`490`	`{`
	`491`	`+ domain = dataset.getDomain(true);`
`491`	`492`	`DomainProperty d = domain.addProperty();`
`492`	`493`	`d.setPropertyURI(pd.getPropertyURI());`
`493`	`494`	`d.setRangeURI(pd.getRangeURI());`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`	`import org.jetbrains.annotations.NotNull;`
`19`	`19`	`import org.jetbrains.annotations.Nullable;`
`20`	`20`	`import org.labkey.api.data.Container;`
`21`		`-import org.labkey.api.data.ContainerFilter;`
`22`	`21`	`import org.labkey.api.data.DbScope;`
`23`	`22`	`import org.labkey.api.data.JdbcType;`
`24`	`23`	`import org.labkey.api.data.SQLFragment;`
`@@ -150,7 +149,7 @@ public List<Map<String, Object>> insertRows(User user, Container container, List`
`150`	`149`
`151`	`150`	`try`
`152`	`151`	`{`
`153`		`- DomainUtil.createDomain(PackageDomainKind.getPackageKindName(), newDomain, null, container, user, null, null);`
	`152`	`+ DomainUtil.createDomain(PackageDomainKind.getPackageKindName(), newDomain, null, container, user, null, null, false);`
`154`	`153`	`}`
`155`	`154`	`catch (ValidationException ve)`
`156`	`155`	`{`