Fix NPE in BeanDefinitionLoader when XML support is disabled

See gh-22696

Fix NPE in BeanDefinitionLoader when XML support is disabled
See gh-22696
2bdeba8a · dreis2211 · Andy Wilkinson · 6efff7b5 · 2bdeba8a
Commit 2bdeba8a authored Aug 01, 2020 by dreis2211 Committed by Andy Wilkinson Aug 03, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

BeanDefinitionLoader.java ...n/java/org/springframework/boot/BeanDefinitionLoader.java +1 -1

No files found.
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java
@@ -189,7 +189,7 @@ class BeanDefinitionLoader {
 	}
 	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
 		try {
 			load(ClassUtils.forName(resolvedSource, null));