Skip to content

S
spring-boot
Commit 0fd4e40e authored by Johnny Lim's avatar Johnny Lim Committed by Andy Wilkinson
Browse files
Options

Add null guards for getBeanDefinition() in BeanTypeRegistry 

Closes gh-13818
parent 9c5330f0
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 6 deletions
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/BeanTypeRegistry.java
View file @ 0fd4e40e
...@@ -159,7 +159,10 @@ final class BeanTypeRegistry implements SmartInitializingSingleton { ...@@ -159,7 +159,10 @@ final class BeanTypeRegistry implements SmartInitializingSingleton {
} }
private void addBeanTypeForNonAliasDefinition(String name) { private void addBeanTypeForNonAliasDefinition(String name) {
addBeanTypeForNonAliasDefinition(name, getBeanDefinition(name)); RootBeanDefinition beanDefinition = getBeanDefinition(name);
if (beanDefinition != null) {
addBeanTypeForNonAliasDefinition(name, beanDefinition);
}
} }
private RootBeanDefinition getBeanDefinition(String name) { private RootBeanDefinition getBeanDefinition(String name) {
...@@ -219,11 +222,13 @@ final class BeanTypeRegistry implements SmartInitializingSingleton { ...@@ -219,11 +222,13 @@ final class BeanTypeRegistry implements SmartInitializingSingleton {
if (!this.beanFactory.isAlias(name) if (!this.beanFactory.isAlias(name)
&& !this.beanFactory.containsSingleton(name)) { && !this.beanFactory.containsSingleton(name)) {
RootBeanDefinition beanDefinition = getBeanDefinition(name); RootBeanDefinition beanDefinition = getBeanDefinition(name);
RootBeanDefinition existingDefinition = this.beanDefinitions.put(name, if (beanDefinition != null) {
beanDefinition); RootBeanDefinition existingDefinition = this.beanDefinitions
if (existingDefinition != null .put(name, beanDefinition);
&& !beanDefinition.equals(existingDefinition)) { if (existingDefinition != null
addBeanTypeForNonAliasDefinition(name, beanDefinition); && !beanDefinition.equals(existingDefinition)) {
addBeanTypeForNonAliasDefinition(name, beanDefinition);
}
} }
} }
} }
......
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