Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert NPE check in the AbstMappingMessageRouter

Browse Source
This commit is contained in:
Artem Bilan
2020-01-25 09:19:59 -05:00
parent 990294b048
commit bfe28dba9a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMappingMessageRouter.java
View File

@@ -312,13 +312,14 @@ public abstract class AbstractMappingMessageRouter extends AbstractMessageRouter
else if (channelKey instanceof Collection) {
addToCollection(channels, (Collection<?>) channelKey, message);
}
else if (getRequiredConversionService().canConvert(channelKey.getClass(), String.class)) {
else if (channelKey != null &&
getRequiredConversionService().canConvert(channelKey.getClass(), String.class)) {
String converted = getConversionService().convert(channelKey, String.class);
if (converted != null) {
addChannelFromString(channels, converted, message);
}
}
else {
else if (channelKey != null) {
throw new MessagingException("unsupported return type for router [" + channelKey.getClass() + "]");
}
}