Fix ClassPathScanningCandidateComponentProvider init

snicoll · snicoll · commit 08fbe872905a · 2016-09-01T14:23:17.000+02:00
Closes gh-6780
diff --git a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentRegisteringPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentRegisteringPostProcessor.java
@@ -95,6 +95,8 @@ private boolean isRunningInEmbeddedContainer() {
 	private ClassPathScanningCandidateComponentProvider createComponentProvider() {
 		ClassPathScanningCandidateComponentProvider componentProvider = new ClassPathScanningCandidateComponentProvider(
 				false);
+		componentProvider.setEnvironment(this.applicationContext.getEnvironment());
+		componentProvider.setResourceLoader(this.applicationContext);
 		for (ServletComponentHandler handler : HANDLERS) {
 			componentProvider.addIncludeFilter(handler.getTypeFilter());
 		}

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,8 @@ private boolean isRunningInEmbeddedContainer() {`
`95`	`95`	`private ClassPathScanningCandidateComponentProvider createComponentProvider() {`
`96`	`96`	`ClassPathScanningCandidateComponentProvider componentProvider = new ClassPathScanningCandidateComponentProvider(`
`97`	`97`	`false);`
	`98`	`+ componentProvider.setEnvironment(this.applicationContext.getEnvironment());`
	`99`	`+ componentProvider.setResourceLoader(this.applicationContext);`
`98`	`100`	`for (ServletComponentHandler handler : HANDLERS) {`
`99`	`101`	`componentProvider.addIncludeFilter(handler.getTypeFilter());`
`100`	`102`	`}`