Skip to content

Commit 83ec9f4

Browse files
committed
Merge branch '6.0.x'
# Conflicts: # build.gradle
2 parents 3f65b85 + 1e403d1 commit 83ec9f4

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

framework-platform/framework-platform.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies {
1313
api(platform("io.netty:netty5-bom:5.0.0.Alpha5"))
1414
api(platform("io.projectreactor:reactor-bom:2022.0.8"))
1515
api(platform("io.rsocket:rsocket-bom:1.1.3"))
16-
api(platform("org.apache.groovy:groovy-bom:4.0.12"))
16+
api(platform("org.apache.groovy:groovy-bom:4.0.13"))
1717
api(platform("org.apache.logging.log4j:log4j-bom:2.20.0"))
1818
api(platform("org.eclipse.jetty:jetty-bom:11.0.15"))
1919
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1"))

spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionSynchronizationUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public static Mono<Void> triggerBeforeCommit(Collection<TransactionSynchronizati
8585
public static Mono<Void> triggerBeforeCompletion(Collection<TransactionSynchronization> synchronizations) {
8686
return Flux.fromIterable(synchronizations)
8787
.concatMap(TransactionSynchronization::beforeCompletion).onErrorContinue((t, o) ->
88-
logger.debug("TransactionSynchronization.beforeCompletion threw exception", t)).then();
88+
logger.error("TransactionSynchronization.beforeCompletion threw exception", t)).then();
8989
}
9090

9191
/**
@@ -115,7 +115,7 @@ public static Mono<Void> invokeAfterCompletion(
115115
Collection<TransactionSynchronization> synchronizations, int completionStatus) {
116116

117117
return Flux.fromIterable(synchronizations).concatMap(it -> it.afterCompletion(completionStatus))
118-
.onErrorContinue((t, o) -> logger.debug("TransactionSynchronization.afterCompletion threw exception", t)).then();
118+
.onErrorContinue((t, o) -> logger.error("TransactionSynchronization.afterCompletion threw exception", t)).then();
119119
}
120120

121121

0 commit comments

Comments
 (0)