Skip to content

S
spring-boot
Commit f4e12e96 authored by Dave Syer's avatar Dave Syer Committed by Phillip Webb
Browse files
Options

Additional condition to protect Reactor 2.0 users 

(cherry picked from 80d55c47)
Closes gh-2255
parent fe83aed6
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfiguration.java
View file @ f4e12e96
...@@ -34,7 +34,7 @@ import reactor.spring.context.config.EnableReactor; ...@@ -34,7 +34,7 @@ import reactor.spring.context.config.EnableReactor;
* @author Dave Syer * @author Dave Syer
*/ */
@Configuration @Configuration
@ConditionalOnClass(EnableReactor.class) @ConditionalOnClass({ EnableReactor.class, Environment.class })
@AutoConfigureAfter(WebMvcAutoConfiguration.class) @AutoConfigureAfter(WebMvcAutoConfiguration.class)
public class ReactorAutoConfiguration { public class ReactorAutoConfiguration {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment