Merge branch '1.1.x'

2017-02-24 09:42:36 +00:00
parent dcaef01b27 331e790026
commit d2ab1c6de9
4 changed files with 123 additions and 0 deletions
--- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapApplicationListener.java
+++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapApplicationListener.java
@@ -81,6 +81,11 @@ public class BootstrapApplicationListener
 		if (environment.getPropertySources().contains(BOOTSTRAP_PROPERTY_SOURCE_NAME)) {
 			return;
 		}
+		for (ApplicationContextInitializer<?> initializer : event.getSpringApplication().getInitializers()) {
+			if (initializer instanceof ParentContextApplicationContextInitializer) {
+				return;
+			}
+		}
 		ConfigurableApplicationContext context = bootstrapServiceContext(environment,
 				event.getSpringApplication());
 		apply(context, event.getSpringApplication(), environment);