Issue 49783: UserManager Optimistic Concurrency Exception (#5278)

LabKey · Feb 28, 2024 · d9a3d30 · d9a3d30
1 parent d1f2249
commit d9a3d30
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/api/src/org/labkey/api/data/DbScope.java b/api/src/org/labkey/api/data/DbScope.java
@@ -709,7 +709,9 @@ public Transaction ensureTransaction(TransactionKind transactionKind, Lock... lo
     }
 
     /**
-     * Starts a new transaction using a new Connection.
+     * Starts a new transaction using a new Connection. Most callers should use ensureTransaction() to join an existing
+     * transaction in the same database.
+     *
      * The preferred usage pattern is:
      * <pre>
      *     try (DbScope.Transaction transaction = scope.beginTransaction()) {
@@ -731,7 +733,9 @@ public Transaction beginTransaction(Lock... locks)
     }
 
     /**
-     * Starts a new transaction using a new Connection.
+     * Starts a new transaction using a new Connection. Most callers should use ensureTransaction() to join an existing
+     * transaction in the same database.
+     *
      * The preferred usage pattern is:
      * <pre>
      *     try (DbScope.Transaction transaction = scope.beginTransaction()) {

diff --git a/api/src/org/labkey/api/security/SecurityManager.java b/api/src/org/labkey/api/security/SecurityManager.java
@@ -1419,7 +1419,7 @@ static void deleteGroup(int groupId)
                 groupId == Group.groupDevelopers)
             throw new IllegalArgumentException("The global groups cannot be deleted.");
 
-        try (Transaction transaction = core.getScope().beginTransaction())
+        try (Transaction transaction = core.getScope().ensureTransaction())
         {
             Group group = getGroup(groupId);
             if (null == group)
@@ -1516,7 +1516,7 @@ public static void deleteMembers(Group group, Collection<UserPrincipal> membersT
             }
             core.getSqlDialect().appendInClauseSql(sql, userIds);
 
-            try (Transaction transaction = core.getScope().beginTransaction())
+            try (Transaction transaction = core.getScope().ensureTransaction())
             {
                 new SqlExecutor(core.getSchema()).execute(sql);
 

diff --git a/api/src/org/labkey/api/security/UserManager.java b/api/src/org/labkey/api/security/UserManager.java
@@ -948,7 +948,7 @@ public static void deleteUser(int userId) throws UserManagementException
                 throw new RuntimeException(first);
         }
 
-        try (Transaction transaction = CORE.getScope().beginTransaction())
+        try (Transaction transaction = CORE.getScope().ensureTransaction())
         {
             boolean needToEnsureRootAdmins = SecurityManager.isRootAdmin(user);
 
@@ -1017,7 +1017,7 @@ public static void setUserActive(User currentUser, User userToAdjust, boolean ac
                 throw new RuntimeException(first);
         }
 
-        try (Transaction transaction = CoreSchema.getInstance().getScope().beginTransaction())
+        try (Transaction transaction = CoreSchema.getInstance().getScope().ensureTransaction())
         {
             Table.update(currentUser, CoreSchema.getInstance().getTableInfoPrincipals(),
                     Collections.singletonMap("Active", active), userId);