Allow nulls with multiple embedded value resolvers

Allow an embedded value resolver added to an AbstractBeanFactory to
return null without adversely effecting any subsequent resolvers.

Issue: SPR-8565
This commit is contained in:
Phillip Webb
2013-01-23 11:02:15 -08:00
parent 9982b4c01a
commit f3ff98d862
2 changed files with 27 additions and 1 deletions

View File

@@ -746,7 +746,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
public String resolveEmbeddedValue(String value) {
String result = value;
for (StringValueResolver resolver : this.embeddedValueResolvers) {
result = resolver.resolveStringValue(result);
result = (result == null ? null : resolver.resolveStringValue(result));
}
return result;
}