Restore hasProgrammaticallySetProfiles code

Restore code lost on merge. See gh-26580
5 years ago · 2bbad94910
1 changed files with 3 additions and 0 deletions
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/Profiles.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/Profiles.java
@ -114,6 +114,9 @@ public class Profiles implements Iterable<String> {
				@@ -114,6 +114,9 @@ public class Profiles implements Iterable<String> {
 		if (!StringUtils.hasLength(environmentPropertyValue)) {
 			return !type.getDefaultValue().equals(environmentProfiles);
 		}
+		if (type.getDefaultValue().equals(environmentProfiles)) {
+			return false;
+		}
 		return !environmentPropertyProfiles.equals(environmentProfiles);
 	}