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

avoid caching for expression results even when specified as TypedStringValue (SPR-6115)

Browse Source
This commit is contained in:
Juergen Hoeller
2009-09-17 10:04:36 +00:00
parent 8bf1ee5e7c
commit 160521074b
5 changed files with 109 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
org.springframework.beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java
View File

@@ -44,6 +44,8 @@ public class TypedStringValue implements BeanMetadataElement {
private String specifiedTypeName;
private volatile boolean dynamic;
/**
* Create a new {@link TypedStringValue} for the given String value.
@@ -185,6 +187,21 @@ public class TypedStringValue implements BeanMetadataElement {
return this.specifiedTypeName;
}
/**
* Mark this value as dynamic, i.e. as containing an expression
* and hence not being subject to caching.
*/
public void setDynamic() {
this.dynamic = true;
}
/**
* Return whether this value has been marked as dynamic.
*/
public boolean isDynamic() {
return this.dynamic;
}
@Override
public boolean equals(Object other) {

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

@@ -1311,7 +1311,8 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
}
deepCopy.add(pv);
}
else if (originalValue instanceof TypedStringValue && convertible &&
else if (convertible && originalValue instanceof TypedStringValue &&
!((TypedStringValue) originalValue).isDynamic() &&
!(convertedValue instanceof Collection || ObjectUtils.isArray(convertedValue))) {
pv.setConvertedValue(convertedValue);
deepCopy.add(pv);

19
org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java
View File

@@ -167,10 +167,10 @@ class BeanDefinitionValueResolver {
Object propKey = propEntry.getKey();
Object propValue = propEntry.getValue();
if (propKey instanceof TypedStringValue) {
propKey = evaluate(((TypedStringValue) propKey).getValue());
propKey = evaluate((TypedStringValue) propKey);
}
if (propValue instanceof TypedStringValue) {
propValue = evaluate(((TypedStringValue) propValue).getValue());
propValue = evaluate((TypedStringValue) propValue);
}
copy.put(propKey, propValue);
}
@@ -179,7 +179,7 @@ class BeanDefinitionValueResolver {
else if (value instanceof TypedStringValue) {
// Convert value to target type here.
TypedStringValue typedStringValue = (TypedStringValue) value;
Object valueObject = evaluate(typedStringValue.getValue());
Object valueObject = evaluate(typedStringValue);
try {
Class<?> resolvedTargetType = resolveTargetType(typedStringValue);
if (resolvedTargetType != null) {
@@ -201,6 +201,19 @@ class BeanDefinitionValueResolver {
}
}
/**
* Evaluate the given value as an expression, if necessary.
* @param value the candidate value (may be an expression)
* @return the resolved value
*/
protected Object evaluate(TypedStringValue value) {
Object result = this.beanFactory.evaluateBeanDefinitionString(value.getValue(), this.beanDefinition);
if (result != value.getValue()) {
value.setDynamic();
}
return result;
}
/**
* Evaluate the given value as an expression, if necessary.
* @param value the candidate value (may be an expression)