Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid NPE in PropertyMappingContextCustomizer

Browse Source 
See gh-9914
This commit is contained in:
Dennis Kieselhorst 2017-07-31 10:26:05 +02:00 committed by Andy Wilkinson
parent 3cc22ecffb
commit e7a6b8c260
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizer.java
View File

@ -79,12 +79,15 @@ class PropertyMappingContextCustomizer implements ContextCustomizer {
Set<Class<?>> components = new LinkedHashSet<Class<?>>(); Set<Class<?>> components = new LinkedHashSet<Class<?>>();
Set<Class<?>> propertyMappings = new LinkedHashSet<Class<?>>(); Set<Class<?>> propertyMappings = new LinkedHashSet<Class<?>>();
while (beanClass != null) { while (beanClass != null) {
for (Annotation annotation : AnnotationUtils.getAnnotations(beanClass)) { Annotation[] annotations = AnnotationUtils.getAnnotations(beanClass);
if (isAnnotated(annotation, Component.class)) { if (annotations != null) {
components.add(annotation.annotationType()); for (Annotation annotation : annotations) {
} if (isAnnotated(annotation, Component.class)) {
if (isAnnotated(annotation, PropertyMapping.class)) { components.add(annotation.annotationType());
propertyMappings.add(annotation.annotationType()); }
if (isAnnotated(annotation, PropertyMapping.class)) {
propertyMappings.add(annotation.annotationType());
}
} }
} }
beanClass = beanClass.getSuperclass(); beanClass = beanClass.getSuperclass();