Additional condition to protect Reactor 2.0 users

(cherry picked from 80d55c47) Closes gh-2255

Additional condition to protect Reactor 2.0 users
(cherry picked from 80d55c47) Closes gh-2255
f4e12e96 · Dave Syer · Phillip Webb · fe83aed6 · f4e12e96
Commit f4e12e96 authored Dec 17, 2014 by Dave Syer Committed by Phillip Webb Dec 30, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

ReactorAutoConfiguration.java .../boot/autoconfigure/reactor/ReactorAutoConfiguration.java +1 -1

No files found.
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfiguration.java
@@ -34,7 +34,7 @@ import reactor.spring.context.config.EnableReactor;
 * @author Dave Syer
 */
 @Configuration
-@ConditionalOnClass(EnableReactor.class)
+@ConditionalOnClass({ EnableReactor.class, Environment.class })
 @AutoConfigureAfter(WebMvcAutoConfiguration.class)
 public class ReactorAutoConfiguration {