diff --git a/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionalOperator.java b/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionalOperator.java index f31a74290462..46afd7a3038a 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionalOperator.java +++ b/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionalOperator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,9 +38,10 @@ * application services utilizing this class, making calls to the low-level * services via an inner-class callback object. * - *
Transactional Publishers should avoid Subscription cancellation. - * Cancelling initiates asynchronous transaction cleanup that does not allow for - * synchronization on completion. + *
Note: Transactional Publishers should avoid Subscription
+ * cancellation. See the
+ * Cancel Signals
+ * section of the Spring Framework reference for more details.
*
* @author Mark Paluch
* @author Juergen Hoeller
diff --git a/src/docs/asciidoc/data-access.adoc b/src/docs/asciidoc/data-access.adoc
index 0a319e148b1b..a8fd91252b72 100644
--- a/src/docs/asciidoc/data-access.adoc
+++ b/src/docs/asciidoc/data-access.adoc
@@ -1457,6 +1457,11 @@ programming arrangements as the following listing shows:
}
----
+Note that there are special considerations for the returned `Publisher` with regards to
+Reactive Streams cancellation signals. See the <