"conversionService" bean gets ignored if not of type ConversionService (SPR-6916)
This commit is contained in:
@@ -856,7 +856,8 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
|
|||||||
*/
|
*/
|
||||||
protected void finishBeanFactoryInitialization(ConfigurableListableBeanFactory beanFactory) {
|
protected void finishBeanFactoryInitialization(ConfigurableListableBeanFactory beanFactory) {
|
||||||
// Initialize conversion service for this context.
|
// 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.setConversionService(
|
||||||
beanFactory.getBean(CONVERSION_SERVICE_BEAN_NAME, ConversionService.class));
|
beanFactory.getBean(CONVERSION_SERVICE_BEAN_NAME, ConversionService.class));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user