From 6842be8e403ad9d56bb65e6b1df84d975e14f051 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Fri, 11 Apr 2008 15:32:05 +0000
Subject: [PATCH] MessagePublishingErrorHandler is no longer set on a Message
 Endpoint that is itself subscribing to the "errorChannel".

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

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/bus/MessageBus.java b/spring-integration-core/src/main/java/org/springframework/integration/bus/MessageBus.java
index f1c9f69265..6c096cd754 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/bus/MessageBus.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/bus/MessageBus.java
@@ -340,7 +340,7 @@ public class MessageBus implements ChannelRegistry, EndpointRegistry, Applicatio
 				}
 				this.registerChannel(outputChannelName, new SimpleChannel());
 			}
-			if (!dme.hasErrorHandler() && this.getErrorChannel() != null) {
+			if (!dme.hasErrorHandler() && this.getErrorChannel() != null && !this.getErrorChannel().equals(channel)) {
 				dme.setErrorHandler(new MessagePublishingErrorHandler(this.getErrorChannel()));
 			}
 		}