Browse Source

Test RxReactiveStreams presence in ReactiveAdapterRegistry

Issue: SPR-17000
pull/1861/merge
Sebastien Deleuze 8 years ago
parent
commit
9b7a492bc9
  1. 3
      spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java

3
spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java

@ -74,7 +74,8 @@ public class ReactiveAdapterRegistry { @@ -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);
}

Loading…
Cancel
Save