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

Merge branch '1.2.x'

This commit is contained in:
Dave Syer 2015-10-08 10:21:06 +01:00
parent 10ce135c7c 7b6de545e7
commit e26a4c5347
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot/src/main/java/org/springframework/boot/env/PropertySourcesLoader.java vendored
View File

@ -18,7 +18,7 @@ package org.springframework.boot.env;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@ -199,7 +199,7 @@ public class PropertySourcesLoader {
* @return the file extensions
*/
public Set<String> getAllFileExtensions() {
Set<String> fileExtensions = new HashSet<String>();
Set<String> fileExtensions = new LinkedHashSet<String>();
for (PropertySourceLoader loader : this.loaders) {
fileExtensions.addAll(Arrays.asList(loader.getFileExtensions()));
}