mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-15 01:07:30 +08:00
Avoid NPE in PropertyMappingContextCustomizer
See gh-9914
This commit is contained in:
parent
3cc22ecffb
commit
e7a6b8c260
@ -79,12 +79,15 @@ class PropertyMappingContextCustomizer implements ContextCustomizer {
|
||||
Set<Class<?>> components = new LinkedHashSet<Class<?>>();
|
||||
Set<Class<?>> propertyMappings = new LinkedHashSet<Class<?>>();
|
||||
while (beanClass != null) {
|
||||
for (Annotation annotation : AnnotationUtils.getAnnotations(beanClass)) {
|
||||
if (isAnnotated(annotation, Component.class)) {
|
||||
components.add(annotation.annotationType());
|
||||
}
|
||||
if (isAnnotated(annotation, PropertyMapping.class)) {
|
||||
propertyMappings.add(annotation.annotationType());
|
||||
Annotation[] annotations = AnnotationUtils.getAnnotations(beanClass);
|
||||
if (annotations != null) {
|
||||
for (Annotation annotation : annotations) {
|
||||
if (isAnnotated(annotation, Component.class)) {
|
||||
components.add(annotation.annotationType());
|
||||
}
|
||||
if (isAnnotated(annotation, PropertyMapping.class)) {
|
||||
propertyMappings.add(annotation.annotationType());
|
||||
}
|
||||
}
|
||||
}
|
||||
beanClass = beanClass.getSuperclass();
|
||||
|
Loading…
Reference in New Issue
Block a user