code review

LabKey · Jan 15, 2024 · a4976f2 · a4976f2
1 parent 586ea4d
commit a4976f2
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/query/src/org/labkey/query/controllers/QueryController.java b/query/src/org/labkey/query/controllers/QueryController.java
@@ -4435,6 +4435,11 @@ protected String getTargetContainerProp()
         }
 
         protected JSONObject executeJson(JSONObject json, CommandType commandType, boolean allowTransaction, Errors errors) throws Exception
+        {
+            return executeJson(json, commandType, allowTransaction, errors, false);
+        }
+
+        protected JSONObject executeJson(JSONObject json, CommandType commandType, boolean allowTransaction, Errors errors, boolean isNestedTransaction) throws Exception
         {
             JSONObject response = new JSONObject();
             Container container = getContainerForCommand(json);
@@ -4548,9 +4553,9 @@ protected JSONObject executeJson(JSONObject json, CommandType commandType, boole
             {
                 if (behaviorType != null && behaviorType != AuditBehaviorType.NONE)
                 {
-                    DbScope.Transaction auditTransaction = transacted ? transaction : table.getSchema().getScope().getCurrentTransaction();
+                    DbScope.Transaction auditTransaction = !transacted && isNestedTransaction ? table.getSchema().getScope().getCurrentTransaction() : transaction;
                     if (auditTransaction == null)
-                        auditTransaction = transaction;
+                        auditTransaction = NO_OP_TRANSACTION;
 
                     if (auditTransaction.getAuditEvent() != null)
                         auditEvent = auditTransaction.getAuditEvent();
@@ -4980,7 +4985,7 @@ else if (scope != tableInfo.getSchema().getScope())
                     }
                     commandObject.put("extraContext", commandExtraContext);
 
-                    JSONObject commandResponse = executeJson(commandObject, command, !transacted, errors);
+                    JSONObject commandResponse = executeJson(commandObject, command, !transacted, errors, transacted);
                     // Bail out immediately if we're going to return a failure-type response message
                     if (commandResponse == null || (errors.hasErrors() && !isSuccessOnValidationError()))
                         return null;