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

SpringBeanAutowiringSupport is able to process @Value annotations on any given target instance (SPR-8574)

Browse Source
This commit is contained in:
Juergen Hoeller
2011-08-03 10:19:27 +00:00
parent 272f145132
commit 8f23c66512
2 changed files with 63 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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