Fix AbstractMappingMessageRouter for NPE

artembilan · artembilan · commit 990294b0487e · 2020-01-24T19:17:08.000-05:00
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
@@ -288,6 +288,9 @@ private void addChannel(Collection<MessageChannel> channels, Message<?> message,
 	}
 
 	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);

Original file line number	Diff line number	Diff line change
`@@ -288,6 +288,9 @@ private void addChannel(Collection<MessageChannel> channels, Message<?> message,`
`288`	`288`	`}`
`289`	`289`
`290`	`290`	`private void addToCollection(Collection<MessageChannel> channels, Collection<?> channelKeys, Message<?> message) {`
	`291`	`+ if (channelKeys == null) {`
	`292`	`+ return;`
	`293`	`+ }`
`291`	`294`	`for (Object channelKey : channelKeys) {`
`292`	`295`	`if (channelKey instanceof MessageChannel) {`
`293`	`296`	`channels.add((MessageChannel) channelKey);`