From 2dfb983d92bbc36f666d3685794c69495f3c06f6 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 4 Mar 2010 11:27:09 +0000 Subject: [PATCH] "conversionService" bean gets ignored if not of type ConversionService (SPR-6916) git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3050 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../context/support/AbstractApplicationContext.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java b/org.springframework.context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java index cea130a762d..b1ea997b40e 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java +++ b/org.springframework.context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java @@ -856,7 +856,8 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader */ protected void finishBeanFactoryInitialization(ConfigurableListableBeanFactory beanFactory) { // Initialize conversion service for this context. - if (beanFactory.containsBean(CONVERSION_SERVICE_BEAN_NAME)) { + if (beanFactory.containsBean(CONVERSION_SERVICE_BEAN_NAME) && + beanFactory.isTypeMatch(CONVERSION_SERVICE_BEAN_NAME, ConversionService.class)) { beanFactory.setConversionService( beanFactory.getBean(CONVERSION_SERVICE_BEAN_NAME, ConversionService.class)); }