root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Restore hasProgrammaticallySetProfiles code 

Restore code lost on merge.

See gh-26580
This commit is contained in:
Phillip Webb 2021-05-17 15:34:45 -07:00
parent 634d27679a
commit 2bbad94910
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/Profiles.java
View File

@ -114,6 +114,9 @@ public class Profiles implements Iterable<String> {
if (!StringUtils.hasLength(environmentPropertyValue)) { if (!StringUtils.hasLength(environmentPropertyValue)) {
return !type.getDefaultValue().equals(environmentProfiles); return !type.getDefaultValue().equals(environmentProfiles);
} }
if (type.getDefaultValue().equals(environmentProfiles)) {
return false;
}
return !environmentPropertyProfiles.equals(environmentProfiles); return !environmentPropertyProfiles.equals(environmentProfiles);
} }