Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: EXPOSED-133 Suspend transactions blocking Hikari connection pool #1837

Merged
merged 3 commits into from
Aug 22, 2023
Merged

fix: EXPOSED-133 Suspend transactions blocking Hikari connection pool #1837

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d8fac7
fix: EXPOSED-133 Suspend transactions blocking Hikari connection pool
bog-walk Aug 18, 2023
4265bd4
fix: EXPOSED-133 Suspend transactions blocking Hikari connection pool
bog-walk Aug 21, 2023
5c6dee3
fix: EXPOSED-133 Suspend transactions blocking Hikari connection pool
bog-walk Aug 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...sed-core/src/main/kotlin/org/jetbrains/exposed/sql/transactions/experimental/Suspended.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ private fun Transaction.resetIfClosed(): Transaction {
}
}

@Suppress("CyclomaticComplexMethod")
private fun <T> TransactionScope.suspendedTransactionAsyncInternal(
shouldCommit: Boolean,
statement: suspend Transaction.() -> T
Expand All @@ -172,7 +173,7 @@ private fun <T> TransactionScope.suspendedTransactionAsyncInternal(

var answer: T
while (true) {
val transaction = tx.value.resetIfClosed()
val transaction = if (repetitions == 0) tx.value else tx.value.resetIfClosed()

@Suppress("TooGenericExceptionCaught")
try {
Expand Down