Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Omit cancellation of transactional Monos in TransactionOperator

Browse Source 
TransactionOperator.as(Mono) now no longer short-cuts via a Flux.next() but provides an implementation via Mono.usingWhen(…).
The short-cut previously issued a cancellation signal to the transactional Mono causing the transaction cleanup to happen without a handle for synchronization.

Using Mono.usingWhen(…) initiates transaction cleanup when the Mono completes eliminating the need for cancellation of the transactional Publisher.

This change does not fully fix gh-23304 but it softens its impact because TransactionalOperator.transactional(Mono) avoids cancellation.
This commit is contained in:
Mark Paluch
2019-09-02 11:51:33 +02:00
committed by Juergen Hoeller
parent f0e160fc67
commit 393a81d4a9
3 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-tx/src/test/java/org/springframework/transaction/reactive/TransactionalOperatorTests.java
View File

@@ -16,6 +16,8 @@
package org.springframework.transaction.reactive;
import java.util.concurrent.atomic.AtomicBoolean;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@@ -46,6 +48,19 @@ public class TransactionalOperatorTests {
assertThat(tm.rollback).isFalse();
}
@Test
public void monoSubscriptionNotCancelled() {
AtomicBoolean cancelled = new AtomicBoolean();
TransactionalOperator operator = TransactionalOperator.create(tm, new DefaultTransactionDefinition());
Mono.just(true).doOnCancel(() -> cancelled.set(true)).as(operator::transactional)
.as(StepVerifier::create)
.expectNext(true)
.verifyComplete();
assertThat(tm.commit).isTrue();
assertThat(tm.rollback).isFalse();
assertThat(cancelled).isFalse();
}
@Test
public void rollbackWithMono() {
TransactionalOperator operator = TransactionalOperator.create(tm, new DefaultTransactionDefinition());