From 9b7a492bc95c8c1f3e3abfe055defa3722a0aa45 Mon Sep 17 00:00:00 2001
From: Sebastien Deleuze <sdeleuze@pivotal.io>
Date: Tue, 3 Jul 2018 17:45:45 +0200
Subject: [PATCH] Test RxReactiveStreams presence in ReactiveAdapterRegistry

Issue: SPR-17000
---
 .../java/org/springframework/core/ReactiveAdapterRegistry.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
index 6e077a96fe..4afa633d3a 100644
--- 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);
 		}