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

INT-2299 polishing

Browse Source
This commit is contained in:
Oleg Zhurakousky
2011-12-15 17:05:43 -05:00
committed by Mark Fisher
parent 0a8b348c98
commit e2f73ba6be
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,10 +87,6 @@ public class RouterFactoryBean extends AbstractStandardMessageHandlerFactoryBean
MessageHandler createMethodInvokingHandler(Object targetObject, String targetMethodName) {
Assert.notNull(targetObject, "target object must not be null");
AbstractMappingMessageRouter router = this.extractTypeIfPossible(targetObject, AbstractMappingMessageRouter.class);
if (this.channelResolver != null){
logger.warn("'channel-resolver' attribute has been deprecated in favor of using SpEL via 'expression' attribute");
router.setChannelResolver(this.channelResolver);
}
if (router == null) {
router = this.createMethodInvokingRouter(targetObject, targetMethodName);
this.configureRouter(router);
@@ -103,6 +99,10 @@ 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;
}