Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source 
Closes gh-13616
This commit is contained in:
Johnny Lim
2018-06-30 02:11:30 +09:00
committed by Stephane Nicoll
parent 809e30506f
commit ab6adc8265
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySource.java
View File

@@ -174,7 +174,7 @@ class SpringIterableConfigurationPropertySource extends SpringConfigurationPrope
private static final class CacheKey {
private Object key;
private final Object key;
private CacheKey(Object key) {
this.key = key;

5
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringProfileAction.java
View File

@@ -67,9 +67,12 @@ class SpringProfileAction extends Action implements InPlayListener {
}
private boolean acceptsProfiles(InterpretationContext ic, Attributes attributes) {
if (this.environment == null) {
return false;
}
String[] profileNames = StringUtils.trimArrayElements(StringUtils
.commaDelimitedListToStringArray(attributes.getValue(NAME_ATTRIBUTE)));
if (this.environment == null || profileNames.length == 0) {
if (profileNames.length == 0) {
return false;
}
for (int i = 0; i < profileNames.length; i++) {