Skip to content

S
spring-boot
Commit c5d1781a authored by Madhura Bhave's avatar Madhura Bhave
Browse files
Options

Merge branch '2.1.x' 

Closes gh-17793
parents c724710a d0d6529f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java
View file @ c5d1781a
...@@ -156,7 +156,8 @@ class OnBeanCondition extends FilteringSpringBootCondition implements Configurat ...@@ -156,7 +156,8 @@ class OnBeanCondition extends FilteringSpringBootCondition implements Configurat
Set<Class<?>> parameterizedContainers = spec.getParameterizedContainers(); Set<Class<?>> parameterizedContainers = spec.getParameterizedContainers();
if (spec.getStrategy() == SearchStrategy.ANCESTORS) { if (spec.getStrategy() == SearchStrategy.ANCESTORS) {
BeanFactory parent = beanFactory.getParentBeanFactory(); BeanFactory parent = beanFactory.getParentBeanFactory();
Assert.isInstanceOf(ConfigurableListableBeanFactory.class, parent, "Unable to use SearchStrategy.PARENTS"); Assert.isInstanceOf(ConfigurableListableBeanFactory.class, parent,
"Unable to use SearchStrategy.ANCESTORS");
beanFactory = (ConfigurableListableBeanFactory) parent; beanFactory = (ConfigurableListableBeanFactory) parent;
} }
MatchResult result = new MatchResult(); MatchResult result = new MatchResult();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment