Fixes spring-cloudgh-1329

bentalebOthmane · Aug 1, 2024 · 7342d2e · 7342d2e
1 parent 9b56a8b
commit 7342d2e
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/...java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java b/...java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java
@@ -314,14 +314,8 @@ private String[] getProfilesForValue(Object property, ConfigurableEnvironment en
 	}
 
 	private String[] resolvePlaceholdersInProfiles(String profiles, ConfigurableEnvironment environment) {
-		return Arrays.stream(StringUtils.tokenizeToStringArray(profiles, ",")).map(s -> {
-			if (s.startsWith("${") && s.endsWith("}")) {
-				return environment.resolvePlaceholders(s);
-			}
-			else {
-				return s;
-			}
-		}).toArray(String[]::new);
+		String resolvedProfiles = environment.resolvePlaceholders(profiles);
+		return StringUtils.tokenizeToStringArray(resolvedProfiles, ",");
 	}
 
 	/*