From f1695552246ce88192591db218c90d0a9367cc1a Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@gopivotal.com>
Date: Tue, 5 Nov 2013 18:34:16 -0500
Subject: [PATCH] INT-3017 Redis TaskExecutor Changes

Don't wrap the TE in an EHTE if there is no BeanFactory.
---
 .../redis/inbound/RedisQueueMessageDrivenEndpoint.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisQueueMessageDrivenEndpoint.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisQueueMessageDrivenEndpoint.java
index 36d7f85a2c..8435439974 100644
--- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisQueueMessageDrivenEndpoint.java
+++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisQueueMessageDrivenEndpoint.java
@@ -156,7 +156,7 @@ public class RedisQueueMessageDrivenEndpoint extends MessageProducerSupport impl
 			String beanName = this.getComponentName();
 			this.taskExecutor = new SimpleAsyncTaskExecutor((beanName == null ? "" : beanName + "-") + this.getComponentType());
 		}
-		if (!(this.taskExecutor instanceof ErrorHandlingTaskExecutor)) {
+		if (!(this.taskExecutor instanceof ErrorHandlingTaskExecutor) && this.getBeanFactory() != null) {
 			MessagePublishingErrorHandler errorHandler =
 					new MessagePublishingErrorHandler(new BeanFactoryChannelResolver(this.getBeanFactory()));
 			errorHandler.setDefaultErrorChannel(this.errorChannel);