From cf2db714d3a7e4b7f733e2b323242281bd8a0328 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@vmware.com>
Date: Wed, 18 Aug 2010 17:17:11 +0000
Subject: [PATCH] INT-1361 Protect Listener Thread from NPE

---
 .../ip/tcp/connection/TcpNioServerConnectionFactory.java       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioServerConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioServerConnectionFactory.java
index 405d3572b8..abb5ae4bfb 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioServerConnectionFactory.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioServerConnectionFactory.java
@@ -151,6 +151,9 @@ public class TcpNioServerConnectionFactory extends AbstractServerConnectionFacto
 						Socket socket = channel.socket();
 						setSocketAttributes(socket);
 						TcpNioConnection connection = createTcpNioConnection(channel);
+						if (connection == null) {
+							continue;
+						}
 						connection.setTaskExecutor(this.taskExecutor);
 						connection.setLastRead(now);
 						connections.put(channel, connection);