Restore hasProgrammaticallySetProfiles code

Restore code lost on merge. See gh-26580

Restore hasProgrammaticallySetProfiles code
Restore code lost on merge. See gh-26580
2bbad949 · Phillip Webb · 634d2767 · 2bbad949
Commit 2bbad949 authored May 17, 2021 by Phillip Webb
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

Profiles.java ...ava/org/springframework/boot/context/config/Profiles.java +3 -0

No files found.
--- 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> {
 		if (!StringUtils.hasLength(environmentPropertyValue)) {
 			return !type.getDefaultValue().equals(environmentProfiles);
 		}
+		if (type.getDefaultValue().equals(environmentProfiles)) {
+			return false;
+		}
 		return !environmentPropertyProfiles.equals(environmentProfiles);
 	}