|
|
|
|
@ -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); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|