From 045011318ee5e43f75c8608ffa502b968358a9c8 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Fri, 10 Oct 2008 23:54:17 +0000
Subject: [PATCH] RouterAnnotationPostProcessor now provides the beanFactory
 reference to the MethodInvokingRouter it creates.

---
 .../annotation/AbstractMethodAnnotationPostProcessor.java       | 2 +-
 .../config/annotation/RouterAnnotationPostProcessor.java        | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
index bbce2d8599..8907771185 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
@@ -51,7 +51,7 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
 	private static final String OUTPUT_CHANNEL_ATTRIBUTE = "outputChannel";
 
 
-	private final GenericBeanFactoryAccessor beanFactoryAccessor;
+	protected final GenericBeanFactoryAccessor beanFactoryAccessor;
 
 	protected final ChannelRegistry channelRegistry;
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessor.java
index c3fb700171..d92f913970 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessor.java
@@ -22,6 +22,7 @@ import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.integration.annotation.Router;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.message.MessageConsumer;
+import org.springframework.integration.router.BeanNameChannelMapping;
 import org.springframework.integration.router.MethodInvokingRouter;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
@@ -41,6 +42,7 @@ public class RouterAnnotationPostProcessor extends AbstractMethodAnnotationPostP
 	@Override
 	protected MessageConsumer createConsumer(Object bean, Method method, Router annotation) {
 		MethodInvokingRouter router = new MethodInvokingRouter(bean, method);
+		router.setChannelMapping(new BeanNameChannelMapping(this.beanFactoryAccessor.getBeanFactory()));
 		String defaultOutputChannelName = annotation.defaultOutputChannel();
 		if (StringUtils.hasText(defaultOutputChannelName)) {
 			MessageChannel defaultOutputChannel = this.channelRegistry.lookupChannel(defaultOutputChannelName);