Merge branch '1.1.x'

This commit is contained in:
Phillip Webb 2014-09-19 22:42:53 -07:00
commit 0468cf5a8f
2 changed files with 4 additions and 4 deletions

View File

@ -78,8 +78,7 @@ class OnWebApplicationCondition extends SpringBootCondition {
}
if (context.getResourceLoader() instanceof WebApplicationContext) {
return ConditionOutcome
.match("found web application WebApplicationContext");
return ConditionOutcome.match("found web application WebApplicationContext");
}
return ConditionOutcome.noMatch("not a web application");

View File

@ -107,7 +107,8 @@ public class PropertySourcesPropertyValues implements PropertyValues {
PropertySourcesPropertyResolver resolver, String[] includes, String[] exacts) {
if (source.getPropertyNames().length > 0) {
for (String propertyName : source.getPropertyNames()) {
if (PropertySourcesPropertyValues.NON_ENUMERABLE_ENUMERABLES.contains(source.getName())
if (PropertySourcesPropertyValues.NON_ENUMERABLE_ENUMERABLES
.contains(source.getName())
&& !PatternMatchUtils.simpleMatch(includes, propertyName)) {
continue;
}