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

Merge pull request #4449 from eddumelendez/gh-4445 

* pr/4449:
  Fix springProfile with multi profiles separated by comma and whitespace
This commit is contained in:
Phillip Webb 2015-11-12 10:50:58 -08:00
parent 6a32955cd4 bd709f30c5
commit b09d0e1e3b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,8 +67,8 @@ class SpringProfileAction extends Action implements InPlayListener {
}
private boolean acceptsProfiles(InterpretationContext ic, Attributes attributes) {
String[] profileNames = StringUtils
.commaDelimitedListToStringArray(attributes.getValue(NAME_ATTRIBUTE));
String[] profileNames = StringUtils.trimArrayElements(StringUtils
.commaDelimitedListToStringArray(attributes.getValue(NAME_ATTRIBUTE)));
if (profileNames.length != 0) {
for (String profileName : profileNames) {
OptionHelper.substVars(profileName, ic, this.context);

2
spring-boot/src/test/resources/org/springframework/boot/logging/logback/multi-profile-names.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml" />
<springProfile name="production,test">
<springProfile name="production, test">
<logger name="org.springframework.boot.logging.logback" level="TRACE" />
</springProfile>
</configuration>