Upgrade to reactor M3

2013-09-15 12:37:07 -07:00
parent ef79d63544
commit 4bb99e80d0
2 changed files with 8 additions and 2 deletions
--- 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
@@ -37,7 +37,6 @@ import reactor.spring.context.config.EnableReactor;
@ConditionalOnClass(EnableReactor.class)
@ConditionalOnMissingBean(Reactor.class)
@AutoConfigureAfter(WebMvcAutoConfiguration.class)
-@EnableReactor
 public class ReactorAutoConfiguration {

 	@Bean
@@ -45,4 +44,11 @@ public class ReactorAutoConfiguration {
 		return environment.getRootReactor();
 	}

+	@Configuration
+	@ConditionalOnMissingBean(Environment.class)
+	@EnableReactor
+	protected static class ReactorConfiguration {
+
+	}
+
 }