From 990294b0487e14596411022249839dd77fe796dd Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Fri, 24 Jan 2020 19:17:08 -0500
Subject: [PATCH] Fix AbstractMappingMessageRouter for NPE

---
 .../integration/router/AbstractMappingMessageRouter.java       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMappingMessageRouter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMappingMessageRouter.java
index ee20673889..26c679a77c 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMappingMessageRouter.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMappingMessageRouter.java
@@ -288,6 +288,9 @@ public abstract class AbstractMappingMessageRouter extends AbstractMessageRouter
 	}
 
 	private void addToCollection(Collection<MessageChannel> channels, Collection<?> channelKeys, Message<?> message) {
+		if (channelKeys == null) {
+			return;
+		}
 		for (Object channelKey : channelKeys) {
 			if (channelKey instanceof MessageChannel) {
 				channels.add((MessageChannel) channelKey);