From bbd28e981787e56408bd8370106e358b189044b7 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Fri, 5 Sep 2008 21:23:37 +0000
Subject: [PATCH] Calling afterPropertiesSet() in post-processor if an endpoint
 was created.

---
 .../integration/bus/DefaultMessageBus.java           | 12 ++++++------
 .../AbstractMethodAnnotationPostProcessor.java       |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java
index cf5a9e1a26..146ae34f23 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java
@@ -271,25 +271,25 @@ public class DefaultMessageBus implements MessageBus, ApplicationContextAware, A
 		if (source == null) {
 			throw new ConfigurationException("endpoint '" + endpoint + "' has no source");
 		}
-		if (source != null && source instanceof SubscribableSource) {
+		if (source instanceof SubscribableSource) {
 			((SubscribableSource) source).subscribe(endpoint);
 			if (source instanceof PollingDispatcher) {
 				PollingDispatcher poller = (PollingDispatcher) source;
 				this.pollingDispatchers.add(poller);
 				this.taskScheduler.schedule(poller);
 			}
-			if (logger.isInfoEnabled()) {
-				logger.info("activated subscription to channel '"
-						+ source + "' for endpoint '" + endpoint + "'");
-			}
 			return;
 		}
-		if (source != null && source instanceof PollableSource) {
+		else if (source instanceof PollableSource) {
 			PollingDispatcher poller = new PollingDispatcher((PollableSource<?>) source, this.defaultPollerSchedule);
 			poller.subscribe(endpoint);
 			this.pollingDispatchers.add(poller);
 			this.taskScheduler.schedule(poller);
 		}
+		if (logger.isInfoEnabled()) {
+			logger.info("activated subscription to channel '"
+					+ source + "' for endpoint '" + endpoint + "'");
+		}
 	}
 
 	private void registerGateway(String name, MessagingGateway gateway) {
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 2137d22346..646638279d 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
@@ -69,6 +69,7 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
 				if (endpoint.getName() == null) {
 					endpoint.setBeanName(this.generateEndpointName(beanName, annotation));
 				}
+				endpoint.afterPropertiesSet();
 				return endpoint;
 			}
 		}