feat: reset outer tx manager when transaction clean up

JetBrains · Aug 25, 2023 · 7dcb3e3 · 7dcb3e3
1 parent 5268df3
commit 7dcb3e3
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/spring-transaction/src/main/kotlin/org/jetbrains/exposed/spring/SpringTransactionManager.kt b/spring-transaction/src/main/kotlin/org/jetbrains/exposed/spring/SpringTransactionManager.kt
@@ -37,11 +37,13 @@ class SpringTransactionManager(
     }
 
     override fun doGetTransaction(): Any {
+        val outerManager = TransactionManager.manager
         val outer = threadLocalTransactionManager.currentOrNull()
 
         return ExposedTransactionObject(
             manager = threadLocalTransactionManager,
-            outerTransaction = outer
+            outerManager = outerManager,
+            outerTransaction = outer,
         )
     }
 
@@ -82,7 +84,7 @@ class SpringTransactionManager(
         }
 
         trxObject.setCurrentToOuter()
-        TransactionManager.resetCurrent(null)
+        TransactionManager.resetCurrent(trxObject.outerManager)
     }
 
     private fun closeStatementsAndConnections(transaction: Transaction) {
@@ -113,6 +115,7 @@ class SpringTransactionManager(
 
     private data class ExposedTransactionObject(
         val manager: TransactionManager,
+        val outerManager: TransactionManager,
         private val outerTransaction: Transaction?,
     ) : SmartTransactionObject {