From e70bf3211d7aaa885a6f98405c9b3c0b2c75bcaa Mon Sep 17 00:00:00 2001
From: Jonas Partner <jonas.partner@gmail.com>
Date: Wed, 8 Oct 2008 10:46:13 +0000
Subject: [PATCH] INT-403

---
 .../integration/endpoint/config/ConsumerEndpointFactoryBean.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/config/ConsumerEndpointFactoryBean.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/config/ConsumerEndpointFactoryBean.java
index c9fe157da3..b89bec30b6 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/config/ConsumerEndpointFactoryBean.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/config/ConsumerEndpointFactoryBean.java
@@ -145,6 +145,7 @@ public class ConsumerEndpointFactoryBean implements FactoryBean, ChannelRegistry
 			MessageChannel channel = (MessageChannel)
 					this.beanFactory.getBean(this.inputChannelName, MessageChannel.class);
 			if (channel instanceof SubscribableChannel) {
+				Assert.isNull(trigger, "A trigger should not be specified when using a SubscribableChannel");
 				this.endpoint = new SubscribingConsumerEndpoint(
 						this.consumer, (SubscribableChannel) channel);
 			}