From d19f67d1045f1b359101bf345702d5cdf12cd483 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Wed, 21 May 2008 17:05:07 +0000
Subject: [PATCH] The endpoint's afterPropertiesSet() method is invoked after
 error-handler configuration so that the error-handler will be configured for
 a ConcurrentTarget (INT-211).

---
 .../java/org/springframework/integration/bus/MessageBus.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBus.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBus.java
index 14b4ef6661..7e38993be3 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBus.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBus.java
@@ -302,7 +302,6 @@ public class MessageBus implements ChannelRegistry, EndpointRegistry, Applicatio
 		if (endpoint.getConcurrencyPolicy() == null && this.defaultConcurrencyPolicy != null) {
 			endpoint.setConcurrencyPolicy(this.defaultConcurrencyPolicy);
 		}
-		endpoint.afterPropertiesSet();
 	}
 
 	public MessageEndpoint unregisterEndpoint(String name) {
@@ -391,6 +390,7 @@ public class MessageBus implements ChannelRegistry, EndpointRegistry, Applicatio
 				targetEndpoint.setErrorHandler(new MessagePublishingErrorHandler(this.getErrorChannel()));
 			}
 		}
+		endpoint.afterPropertiesSet();
 		this.activateSubscription(channel, endpoint, subscription.getSchedule());
 		if (logger.isInfoEnabled()) {
 			logger.info("activated subscription to channel '" + channel.getName() +