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

do not insist on BeanDefinition presence for @Value resolution (for use in unit tests; SPR-6918)

This commit is contained in:
Juergen Hoeller 2010-03-16 23:47:40 +00:00
parent ff09482653
commit b8c0e153e3
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
View File

@ -1242,7 +1242,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
if (this.beanExpressionResolver == null) { if (this.beanExpressionResolver == null) {
return value; return value;
} }
Scope scope = getRegisteredScope(beanDefinition.getScope()); Scope scope = (beanDefinition != null ? getRegisteredScope(beanDefinition.getScope()) : null);
return this.beanExpressionResolver.evaluate(value, new BeanExpressionContext(this, scope)); return this.beanExpressionResolver.evaluate(value, new BeanExpressionContext(this, scope));
} }

3
org.springframework.beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
View File

@ -694,7 +694,8 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
if (value != null) { if (value != null) {
if (value instanceof String) { if (value instanceof String) {
String strVal = resolveEmbeddedValue((String) value); String strVal = resolveEmbeddedValue((String) value);
value = evaluateBeanDefinitionString(strVal, getMergedBeanDefinition(beanName)); BeanDefinition bd = (containsBean(beanName) ? getMergedBeanDefinition(beanName) : null);
value = evaluateBeanDefinitionString(strVal, bd);
} }
TypeConverter converter = (typeConverter != null ? typeConverter : getTypeConverter()); TypeConverter converter = (typeConverter != null ? typeConverter : getTypeConverter());
return converter.convertIfNecessary(value, type); return converter.convertIfNecessary(value, type);