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

moved ChannelResolver setter call to configureRouter() method

Browse Source
This commit is contained in:
Mark Fisher
2011-12-15 17:14:55 -05:00
parent e2f73ba6be
commit 2928830868
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-integration-core/src/main/java/org/springframework/integration/config/RouterFactoryBean.java
View File

@@ -99,10 +99,6 @@ public class RouterFactoryBean extends AbstractStandardMessageHandlerFactoryBean
return (MessageHandler) targetObject;
}
}
if (this.channelResolver != null){
logger.warn("'channel-resolver' attribute has been deprecated in favor of using SpEL via 'expression' attribute");
router.setChannelResolver(this.channelResolver);
}
return router;
}
@@ -118,6 +114,7 @@ public class RouterFactoryBean extends AbstractStandardMessageHandlerFactoryBean
return router;
}
@SuppressWarnings("deprecation")
private AbstractMappingMessageRouter configureRouter(AbstractMappingMessageRouter router) {
if (this.channelMappings != null) {
router.setChannelMappings(this.channelMappings);
@@ -137,6 +134,10 @@ public class RouterFactoryBean extends AbstractStandardMessageHandlerFactoryBean
if (this.resolutionRequired != null) {
router.setResolutionRequired(this.resolutionRequired);
}
if (this.channelResolver != null) {
logger.warn("'channel-resolver' attribute has been deprecated in favor of using SpEL via 'expression' attribute");
router.setChannelResolver(this.channelResolver);
}
return router;
}