Refactor FlowRunner transaction invocation (#2612)

weiminyu · web-flow · commit 304f0002b4c2 · 2024-11-21T15:58:26.000Z
Stop calling `transact` if already in a transaction.
diff --git a/core/src/main/java/google/registry/flows/FlowRunner.java b/core/src/main/java/google/registry/flows/FlowRunner.java
@@ -75,7 +75,8 @@ public EppOutput run(final EppMetric.Builder eppMetricBuilder) throws EppExcepti
       flowReporter.recordToLogs();
     }
     eppMetricBuilder.setCommandNameFromFlow(flowClass.getSimpleName());
-    if (!isTransactional) {
+    // We may already be in a transaction, e.g., when invoked by DeleteExpiredDomainsAction.
+    if (!isTransactional || jpaTransactionManager.inTransaction()) {
       return EppOutput.create(flowProvider.get().run());
     }
     try {

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,8 @@ public EppOutput run(final EppMetric.Builder eppMetricBuilder) throws EppExcepti`
`75`	`75`	`flowReporter.recordToLogs();`
`76`	`76`	`}`
`77`	`77`	`eppMetricBuilder.setCommandNameFromFlow(flowClass.getSimpleName());`
`78`		`- if (!isTransactional) {`
	`78`	`+ // We may already be in a transaction, e.g., when invoked by DeleteExpiredDomainsAction.`
	`79`	`+ if (!isTransactional \|\| jpaTransactionManager.inTransaction()) {`
`79`	`80`	`return EppOutput.create(flowProvider.get().run());`
`80`	`81`	`}`
`81`	`82`	`try {`