Restore hasProgrammaticallySetProfiles code

Restore code lost on merge. See gh-26580
spring-projects · May 17, 2021 · 2bbad94 · 2bbad94
1 parent 634d276
commit 2bbad94
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/...t-project/spring-boot/src/main/java/org/springframework/boot/context/config/Profiles.java b/...t-project/spring-boot/src/main/java/org/springframework/boot/context/config/Profiles.java
@@ -114,6 +114,9 @@ private boolean hasProgrammaticallySetProfiles(Type type, String environmentProp
 		if (!StringUtils.hasLength(environmentPropertyValue)) {
 			return !type.getDefaultValue().equals(environmentProfiles);
 		}
+		if (type.getDefaultValue().equals(environmentProfiles)) {
+			return false;
+		}
 		return !environmentPropertyProfiles.equals(environmentProfiles);
 	}