root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Make sure property mapping exception are swallowed

This commit is contained in:
Madhura Bhave 2018-04-03 16:12:24 -07:00
parent e5f8078749
commit 30e3cf4c01
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringConfigurationPropertySource.java
View File

@ -77,7 +77,8 @@ class SpringConfigurationPropertySource implements ConfigurationPropertySource {
Assert.notNull(propertySource, "PropertySource must not be null");
Assert.notNull(mapper, "Mapper must not be null");
this.propertySource = propertySource;
this.mapper = mapper;
this.mapper = (mapper instanceof DelegatingPropertyMapper ? mapper
: new DelegatingPropertyMapper(mapper));
this.containsDescendantOf = (containsDescendantOf != null ? containsDescendantOf
: (n) -> ConfigurationPropertyState.UNKNOWN);
}