root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.3.x' 

Closes gh-21867
This commit is contained in:
Stephane Nicoll 2020-06-10 18:13:57 +02:00
parent dbaa59680d 6c926f7849
commit a8da75a396
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfiguration.java
View File

@ -55,6 +55,7 @@ public class CassandraReactiveDataAutoConfiguration {
} }
@Bean @Bean
@ConditionalOnMissingBean
public ReactiveSessionFactory reactiveCassandraSessionFactory(ReactiveSession reactiveCassandraSession) { public ReactiveSessionFactory reactiveCassandraSessionFactory(ReactiveSession reactiveCassandraSession) {
return new DefaultReactiveSessionFactory(reactiveCassandraSession); return new DefaultReactiveSessionFactory(reactiveCassandraSession);
} }