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

Fix NPE in BeanDefinitionLoader when XML support is disabled 

See gh-22696
This commit is contained in:
dreis2211 2020-08-01 12:35:51 +02:00 committed by Andy Wilkinson
parent 6efff7b585
commit 2bdeba8aaa
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java
View File

@ -189,7 +189,7 @@ class BeanDefinitionLoader {
} }
private void load(CharSequence source) { private void load(CharSequence source) {
String resolvedSource = this.xmlReader.getEnvironment().resolvePlaceholders(source.toString()); String resolvedSource = this.scanner.getEnvironment().resolvePlaceholders(source.toString());
// Attempt as a Class // Attempt as a Class
try { try {
load(ClassUtils.forName(resolvedSource, null)); load(ClassUtils.forName(resolvedSource, null));