From f4e12e96c69848cd3840964a41040cc15d7defe9 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Wed, 17 Dec 2014 17:09:57 +0000
Subject: [PATCH] Additional condition to protect Reactor 2.0 users

(cherry picked from 80d55c47)
Closes gh-2255
---
 .../boot/autoconfigure/reactor/ReactorAutoConfiguration.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 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
index 2051ad8e92..a220df9ca9 100644
--- 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 {