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

Merge pull request #5512 from rob-baily/issues-5465 

* pr/5512:
  Polish contribution
  Add check for non empty list of factories
This commit is contained in:
Stephane Nicoll 2016-03-29 13:05:56 +02:00
parent 1b8f44ae2a 33967927db
commit 0c1dd1aac5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfigurationImportSelector.java
View File

@ -140,8 +140,12 @@ public class EnableAutoConfigurationImportSelector
*/ */
protected List<String> getCandidateConfigurations(AnnotationMetadata metadata, protected List<String> getCandidateConfigurations(AnnotationMetadata metadata,
AnnotationAttributes attributes) { AnnotationAttributes attributes) {
return SpringFactoriesLoader.loadFactoryNames( List<String> configurations = SpringFactoriesLoader.loadFactoryNames(
getSpringFactoriesLoaderFactoryClass(), getBeanClassLoader()); getSpringFactoriesLoaderFactoryClass(), getBeanClassLoader());
Assert.notEmpty(configurations,
"No auto configuration classes found in META-INF/spring.factories. If you" +
"are using a custom packaging, make sure that file is correct.");
return configurations;
} }
/** /**