File tree Expand file tree Collapse file tree 1 file changed +3
-2
lines changed
spring-beans/src/main/java/org/springframework/beans/factory/support Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Original file line number Diff line number Diff line change 1
1
/*
2
- * Copyright 2002-2010 the original author or authors.
2
+ * Copyright 2002-2012 the original author or authors.
3
3
*
4
4
* Licensed under the Apache License, Version 2.0 (the "License");
5
5
* you may not use this file except in compliance with the License.
38
38
import org .springframework .beans .factory .config .RuntimeBeanReference ;
39
39
import org .springframework .beans .factory .config .TypedStringValue ;
40
40
import org .springframework .util .ClassUtils ;
41
+ import org .springframework .util .ObjectUtils ;
41
42
import org .springframework .util .StringUtils ;
42
43
43
44
/**
@@ -208,7 +209,7 @@ else if (value instanceof TypedStringValue) {
208
209
*/
209
210
protected Object evaluate (TypedStringValue value ) {
210
211
Object result = this .beanFactory .evaluateBeanDefinitionString (value .getValue (), this .beanDefinition );
211
- if (result != value .getValue ()) {
212
+ if (! ObjectUtils . nullSafeEquals ( result , value .getValue () )) {
212
213
value .setDynamic ();
213
214
}
214
215
return result ;
You can’t perform that action at this time.
0 commit comments