From 17edbec0351f35aaea61f876fe617e6bbe40b58a Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 13 Dec 2019 16:30:03 +0100 Subject: [PATCH] Polishing --- .../org/springframework/core/env/AbstractEnvironment.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java b/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java index cfb3fd813670..56c894fa0501 100644 --- a/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java +++ b/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java @@ -469,9 +469,7 @@ public void merge(ConfigurableEnvironment parent) { 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); } } }