Merge branch '5.3.x'

2021-10-08 20:42:54 +02:00
parent fa3a2dc981 87aaf5049b
commit 56eefe2a13
6 changed files with 68 additions and 17 deletions
--- a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
+++ b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
@@ -40,7 +40,7 @@ import org.springframework.util.ConcurrentReferenceHashMap;
 /**
 * A registry of adapters to adapt Reactive Streams {@link Publisher} to/from
 * various async/reactive types such as {@code CompletableFuture}, RxJava
- * {@code Observable}, and others.
+ * {@code Flowable}, and others.
 *
 * <p>By default, depending on classpath availability, adapters are registered
 * for Reactor, RxJava 3, {@link CompletableFuture}, {@code Flow.Publisher},