From d3c54d979ec211595e379607a3556e4d79119691 Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Tue, 7 Jul 2009 20:13:21 +0000 Subject: [PATCH] SPR-5906: test and fix for using expressions in property list keys and values --- .../beans/factory/support/BeanDefinitionValueResolver.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java index d8527cf236..21f914a75a 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java @@ -167,10 +167,10 @@ class BeanDefinitionValueResolver { Object propKey = propEntry.getKey(); Object propValue = propEntry.getValue(); if (propKey instanceof TypedStringValue) { - propKey = ((TypedStringValue) propKey).getValue(); + propKey = evaluate(((TypedStringValue) propKey).getValue()); } if (propValue instanceof TypedStringValue) { - propValue = ((TypedStringValue) propValue).getValue(); + propValue = evaluate(((TypedStringValue) propValue).getValue()); } copy.put(propKey, propValue); }