root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Populate cache in ConfigFileApplicationListener 

Fix `ConfigFileApplicationListener` so that the loadDocumentsCache is
populated when documents are loaded.

Closes gh-12732
This commit is contained in:
dreis2211 2018-04-04 18:09:08 -07:00 committed by Phillip Webb
parent 35b4cd01ab
commit cc66de28d0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
View File

@ -539,12 +539,12 @@ public class ConfigFileApplicationListener
private List<Document> loadDocuments(PropertySourceLoader loader, String name, private List<Document> loadDocuments(PropertySourceLoader loader, String name,
Resource resource) throws IOException { Resource resource) throws IOException {
loader.load(name, resource);
DocumentsCacheKey cacheKey = new DocumentsCacheKey(loader, resource); DocumentsCacheKey cacheKey = new DocumentsCacheKey(loader, resource);
List<Document> documents = this.loadDocumentsCache.get(cacheKey); List<Document> documents = this.loadDocumentsCache.get(cacheKey);
if (documents == null) { if (documents == null) {
List<PropertySource<?>> loaded = loader.load(name, resource); List<PropertySource<?>> loaded = loader.load(name, resource);
documents = asDocuments(loaded); documents = asDocuments(loaded);
this.loadDocumentsCache.put(cacheKey, documents);
} }
return documents; return documents;
} }