From ccc44db8eb9b070f1eca6887e85d4af4620c7b2a Mon Sep 17 00:00:00 2001 From: Kees Koffeman Date: Wed, 8 Jul 2015 14:15:53 +0200 Subject: [PATCH] Search in ancestors for bean of type ConfigClientProperties Before this change we check that it is there, then don't look in the ancestors. A test would be useful. Fixes gh-191 --- .../cloud/config/client/ConfigClientAutoConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientAutoConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientAutoConfiguration.java index 8ac84b74..73ff3d29 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientAutoConfiguration.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientAutoConfiguration.java @@ -44,7 +44,7 @@ public class ConfigClientAutoConfiguration { if (context.getParent() != null && BeanFactoryUtils.beanNamesForTypeIncludingAncestors( context.getParent(), ConfigClientProperties.class).length > 0) { - return BeanFactoryUtils.beanOfType(context.getParent(), + return BeanFactoryUtils.beanOfTypeIncludingAncestors(context.getParent(), ConfigClientProperties.class); } ConfigClientProperties client = new ConfigClientProperties(environment);