Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Test RxReactiveStreams presence in ReactiveAdapterRegistry

Browse Source 
Issue: SPR-17000
This commit is contained in:
Sebastien Deleuze
2018-07-03 17:45:45 +02:00
parent f7d22a0b42
commit 9b7a492bc9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}