From 8b2346aa342aac2c799c085fa3fcd4ed88ec49c0 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Wed, 18 Aug 2010 17:15:14 +0000 Subject: [PATCH] INT-1361 NPE If Empty Interceptor Factory Chain Configured --- .../ip/tcp/connection/AbstractConnectionFactory.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java index 22f25e9a60..efb4b86bb6 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java @@ -325,8 +325,12 @@ public abstract class AbstractConnectionFactory if (this.interceptorFactoryChain == null) { return connection; } - for (TcpConnectionInterceptorFactory factory : - this.interceptorFactoryChain.getInterceptorFactories()) { + TcpConnectionInterceptorFactory[] interceptorFactories = + this.interceptorFactoryChain.getInterceptorFactories(); + if (interceptorFactories == null) { + return connection; + } + for (TcpConnectionInterceptorFactory factory : interceptorFactories) { TcpConnectionInterceptor wrapper = factory.getInterceptor(); wrapper.setTheConnection(connection); // if no ultimate listener or sender, register each wrapper in turn