* Fix SplitterFactoryBean for NPE on the discardChannelName

artembilan · artembilan · commit 62d3f4befc9d · 2019-04-05T15:24:07.000-04:00
propagation
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/SplitterFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/SplitterFactoryBean.java
@@ -106,7 +106,7 @@ protected AbstractMessageSplitter configureSplitter(AbstractMessageSplitter spli
 		if (this.discardChannel != null) {
 			splitter.setDiscardChannel(this.discardChannel);
 		}
-		else {
+		else if (StringUtils.hasText(this.discardChannelName)) {
 			splitter.setDiscardChannelName(this.discardChannelName);
 		}
 		return splitter;

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ protected AbstractMessageSplitter configureSplitter(AbstractMessageSplitter spli`
`106`	`106`	`if (this.discardChannel != null) {`
`107`	`107`	`splitter.setDiscardChannel(this.discardChannel);`
`108`	`108`	`}`
`109`		`- else {`
	`109`	`+ else if (StringUtils.hasText(this.discardChannelName)) {`
`110`	`110`	`splitter.setDiscardChannelName(this.discardChannelName);`
`111`	`111`	`}`
`112`	`112`	`return splitter;`