Browse Source

Polishing

pull/24212/head
Sam Brannen 6 years ago
parent
commit
17edbec035
  1. 4
      spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java

4
spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java vendored

@ -469,9 +469,7 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment { @@ -469,9 +469,7 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
if (!ObjectUtils.isEmpty(parentDefaultProfiles)) {
synchronized (this.defaultProfiles) {
this.defaultProfiles.remove(RESERVED_DEFAULT_PROFILE_NAME);
for (String profile : parentDefaultProfiles) {
this.defaultProfiles.add(profile);
}
Collections.addAll(this.defaultProfiles, parentDefaultProfiles);
}
}
}

Loading…
Cancel
Save