From 2928830868dfc31ddb8f7ecd63eeae3249925089 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Thu, 15 Dec 2011 17:14:55 -0500 Subject: [PATCH] moved ChannelResolver setter call to configureRouter() method --- .../integration/config/RouterFactoryBean.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/RouterFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/RouterFactoryBean.java index c1713008ca..4e0d377024 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/RouterFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/RouterFactoryBean.java @@ -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; }