From bacbee1588f5f51ddfaa7073c4ea158a2af36bac Mon Sep 17 00:00:00 2001
From: Josh Long <jolong@vmware.com>
Date: Tue, 17 Aug 2010 23:23:06 +0000
Subject: [PATCH] fixed a potential NPE

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

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java
index 4add2ad8bd..c28df962cd 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java
@@ -160,7 +160,7 @@ public class ConsumerEndpointFactoryBean
 
 			if (channel instanceof SubscribableChannel) {
 				Assert.isNull(this.pollerMetadata, "A poller should not be specified for endpoint '" + this.beanName
-						+ "', since '" + this.inputChannel + "' is a SubscribableChannel (not pollable).");
+						+ "', since '" + channel + "' is a SubscribableChannel (not pollable).");
 				this.endpoint = new EventDrivenConsumer((SubscribableChannel) channel, this.handler);
 			}
 			else if (channel instanceof PollableChannel) {