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

no longer falling back to "conversionService" after checking for "integrationConversionService"

Browse Source
This commit is contained in:
Mark Fisher
2010-03-11 22:48:27 +00:00
parent 893a4497bc
commit 433b76618b
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
org.springframework.integration/src/main/java/org/springframework/integration/context/IntegrationContextUtils.java
View File

@@ -17,8 +17,6 @@
package org.springframework.integration.context;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.convert.ConversionService;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.scheduling.PollerMetadata;
@@ -62,17 +60,7 @@ public abstract class IntegrationContextUtils {
}
public static ConversionService getConversionService(BeanFactory beanFactory) {
ConversionService conversionService = getBeanOfType(beanFactory,
INTEGRATION_CONVERSION_SERVICE_BEAN_NAME, ConversionService.class);
if (conversionService == null && beanFactory instanceof ConfigurableListableBeanFactory) {
conversionService = ((ConfigurableListableBeanFactory) beanFactory).getConversionService();
}
if (conversionService == null && beanFactory.containsBean(
ConfigurableApplicationContext.CONVERSION_SERVICE_BEAN_NAME)) {
conversionService = getBeanOfType(beanFactory,
ConfigurableApplicationContext.CONVERSION_SERVICE_BEAN_NAME, ConversionService.class);
}
return conversionService;
return getBeanOfType(beanFactory, INTEGRATION_CONVERSION_SERVICE_BEAN_NAME, ConversionService.class);
}
private static <T> T getBeanOfType(BeanFactory beanFactory, String beanName, Class<T> type) {

3
org.springframework.integration/src/main/java/org/springframework/integration/context/IntegrationObjectSupport.java
View File

@@ -132,8 +132,7 @@ public abstract class IntegrationObjectSupport implements ComponentMetadataProvi
if (this.conversionService == null && logger.isWarnEnabled()) {
logger.warn("Unable to attempt conversion of Message payload types. Component '" +
this.getBeanName() + "' has no explicit ConversionService reference, " +
"and there is no 'integrationConversionService' or 'conversionService' " +
"bean within the context.");
"and there is no 'integrationConversionService' bean within the context.");
}
}
return this.conversionService;