From e0563a6173cd02438b98e23d444d1558ec888365 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Mon, 21 Apr 2008 20:51:38 +0000 Subject: [PATCH] Checking for null prior to setting the channelRegistry on the endpoint's handler (short term fix for INT-202). --- .../springframework/integration/endpoint/TargetEndpoint.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/TargetEndpoint.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/TargetEndpoint.java index 6396579c53..9a98f97765 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/TargetEndpoint.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/TargetEndpoint.java @@ -146,7 +146,7 @@ public class TargetEndpoint implements MessageEndpoint, BeanNameAware { } public void afterPropertiesSet() { - if (this.target instanceof ChannelRegistryAware) { + if (this.target instanceof ChannelRegistryAware && this.channelRegistry != null) { ((ChannelRegistryAware) this.target).setChannelRegistry(this.channelRegistry); } if (this.concurrencyPolicy != null && !(this.target instanceof ConcurrentTarget)) {