Remove redundant invocation of getActiveProfiles

See gh-17271
This commit is contained in:
陈其苗 2019-06-20 10:56:41 +08:00 committed by Andy Wilkinson
parent cca005f756
commit f86cfff77f
1 changed files with 0 additions and 2 deletions

View File

@ -519,8 +519,6 @@ public class SpringApplication {
* @see org.springframework.boot.context.config.ConfigFileApplicationListener
*/
protected void configureProfiles(ConfigurableEnvironment environment, String[] args) {
environment.getActiveProfiles(); // ensure they are initialized
// But these ones should go first (last wins in a property key clash)
Set<String> profiles = new LinkedHashSet<>(this.additionalProfiles);
profiles.addAll(Arrays.asList(environment.getActiveProfiles()));
environment.setActiveProfiles(StringUtils.toStringArray(profiles));