From 2bdeba8aaa23f925982897b426328cf55df86fbc Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Sat, 1 Aug 2020 12:35:51 +0200 Subject: [PATCH] Fix NPE in BeanDefinitionLoader when XML support is disabled See gh-22696 --- .../java/org/springframework/boot/BeanDefinitionLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 6719541f47..93fdf1658f 100644 --- 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));