Configuration class processing uses MetadataReaderFactory for current ResourceLoader

jhoeller · jhoeller · commit 669d5815c93a · 2016-09-13T22:30:12.000+02:00
Issue: SPR-14684 (cherry picked from commit 5405c07)
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
@@ -205,6 +205,9 @@ public void setEnvironment(Environment environment) {
 	public void setResourceLoader(ResourceLoader resourceLoader) {
 		Assert.notNull(resourceLoader, "ResourceLoader must not be null");
 		this.resourceLoader = resourceLoader;
+		if (!this.setMetadataReaderFactoryCalled) {
+			this.metadataReaderFactory = new CachingMetadataReaderFactory(resourceLoader);
+		}
 	}
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -205,6 +205,9 @@ public void setEnvironment(Environment environment) {`
`205`	`205`	`public void setResourceLoader(ResourceLoader resourceLoader) {`
`206`	`206`	`Assert.notNull(resourceLoader, "ResourceLoader must not be null");`
`207`	`207`	`this.resourceLoader = resourceLoader;`
	`208`	`+ if (!this.setMetadataReaderFactoryCalled) {`
	`209`	`+ this.metadataReaderFactory = new CachingMetadataReaderFactory(resourceLoader);`
	`210`	`+ }`
`208`	`211`	`}`
`209`	`212`
`210`	`213`	`@Override`