Fix NPE in BeanDefinitionLoader when XML support is disabled

dreis2211 · wilkinsona · commit 2bdeba8aaa23 · 2020-08-03T09:53:40.000+01:00
See gh-22696
diff --git 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 @@ private void load(Package 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
 		try {
 			load(ClassUtils.forName(resolvedSource, null));

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ private void load(Package source) {`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`private void load(CharSequence source) {`
`192`		`- String resolvedSource = this.xmlReader.getEnvironment().resolvePlaceholders(source.toString());`
	`192`	`+ String resolvedSource = this.scanner.getEnvironment().resolvePlaceholders(source.toString());`
`193`	`193`	`// Attempt as a Class`
`194`	`194`	`try {`
`195`	`195`	`load(ClassUtils.forName(resolvedSource, null));`