From 3ad89f10742136d2a5d3327663a298bc732bca1b Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Fri, 21 Dec 2007 19:27:01 +0000
Subject: [PATCH] Checking defaultOutputChannel for null

---
 .../integration/endpoint/GenericMessageEndpoint.java         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/GenericMessageEndpoint.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/GenericMessageEndpoint.java
index cff57abed8..9d9a07e913 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/GenericMessageEndpoint.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/GenericMessageEndpoint.java
@@ -128,7 +128,10 @@ public class GenericMessageEndpoint implements MessageEndpoint {
 		if (replyChannelName != null && replyChannelName.trim().length() > 0) {
 			return this.channelRegistry.lookupChannel(replyChannelName);
 		}
-		return this.channelRegistry.lookupChannel(this.defaultOutputChannelName);
+		if (this.defaultOutputChannelName != null) {
+			return this.channelRegistry.lookupChannel(this.defaultOutputChannelName);
+		}
+		return null;
 	}
 
 }