root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch '6.0.x' 

# Conflicts:
#	build.gradle
This commit is contained in:
Juergen Hoeller 2023-06-30 13:00:04 +02:00
parent 3f65b8506b 1e403d1606
commit 83ec9f4fe7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework-platform/framework-platform.gradle
View File

@ -13,7 +13,7 @@ dependencies {
api(platform("io.netty:netty5-bom:5.0.0.Alpha5")) api(platform("io.netty:netty5-bom:5.0.0.Alpha5"))
api(platform("io.projectreactor:reactor-bom:2022.0.8")) api(platform("io.projectreactor:reactor-bom:2022.0.8"))
api(platform("io.rsocket:rsocket-bom:1.1.3")) api(platform("io.rsocket:rsocket-bom:1.1.3"))
api(platform("org.apache.groovy:groovy-bom:4.0.12")) api(platform("org.apache.groovy:groovy-bom:4.0.13"))
api(platform("org.apache.logging.log4j:log4j-bom:2.20.0")) api(platform("org.apache.logging.log4j:log4j-bom:2.20.0"))
api(platform("org.eclipse.jetty:jetty-bom:11.0.15")) api(platform("org.eclipse.jetty:jetty-bom:11.0.15"))
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1")) api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1"))

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

@ -85,7 +85,7 @@ abstract class TransactionSynchronizationUtils {
public static Mono<Void> triggerBeforeCompletion(Collection<TransactionSynchronization> synchronizations) { public static Mono<Void> triggerBeforeCompletion(Collection<TransactionSynchronization> synchronizations) {
return Flux.fromIterable(synchronizations) return Flux.fromIterable(synchronizations)
.concatMap(TransactionSynchronization::beforeCompletion).onErrorContinue((t, o) -> .concatMap(TransactionSynchronization::beforeCompletion).onErrorContinue((t, o) ->
logger.debug("TransactionSynchronization.beforeCompletion threw exception", t)).then(); logger.error("TransactionSynchronization.beforeCompletion threw exception", t)).then();
} }
/** /**
@ -115,7 +115,7 @@ abstract class TransactionSynchronizationUtils {
Collection<TransactionSynchronization> synchronizations, int completionStatus) { Collection<TransactionSynchronization> synchronizations, int completionStatus) {
return Flux.fromIterable(synchronizations).concatMap(it -> it.afterCompletion(completionStatus)) return Flux.fromIterable(synchronizations).concatMap(it -> it.afterCompletion(completionStatus))
.onErrorContinue((t, o) -> logger.debug("TransactionSynchronization.afterCompletion threw exception", t)).then(); .onErrorContinue((t, o) -> logger.error("TransactionSynchronization.afterCompletion threw exception", t)).then();
} }