Test RxReactiveStreams presence in ReactiveAdapterRegistry

Issue: SPR-17000
6 years ago · 9b7a492bc9
parent f7d22a0b42
commit 9b7a492bc9
1 changed files with 2 additions and 1 deletions
--- a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
+++ b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
@ -74,7 +74,8 @@ public class ReactiveAdapterRegistry {
 		this.reactorPresent = reactorRegistered;

 		// RxJava1
-		if (ClassUtils.isPresent("rx.Observable", classLoader)) {
+		if (ClassUtils.isPresent("rx.Observable", classLoader) &&
+				ClassUtils.isPresent("rx.RxReactiveStreams", classLoader)) {
 			new RxJava1Registrar().registerAdapters(this);
 		}