Merge branch '1.5.x'

9 years ago · 464a54ce04
1 changed files with 1 additions and 1 deletions
--- a/spring-boot/src/main/java/org/springframework/boot/env/YamlPropertySourceLoader.java
+++ b/spring-boot/src/main/java/org/springframework/boot/env/YamlPropertySourceLoader.java
@ -78,7 +78,7 @@ public class YamlPropertySourceLoader implements PropertySourceLoader {
				@@ -78,7 +78,7 @@ public class YamlPropertySourceLoader implements PropertySourceLoader {
 				setMatchDefault(false);
 				setDocumentMatchers(new SpringProfileDocumentMatcher(profile));
 			}
-			setResources(new Resource[] { resource });
+			setResources(resource);
 		}

 		@Override