SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing, avoiding NPE for when functions are not present

Browse Source 
Rebased and fixed merge conflicts

Resolves #1481
Resolves #1480
This commit is contained in:
Oleg Zhurakousky
2018-09-21 12:05:42 +02:00
parent a0b4617ac7
commit 99289b31bd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java
View File

@@ -117,7 +117,7 @@ public abstract class AbstractMessageChannelBinder<C extends ConsumerProperties,
@Autowired(required = false)
private IntegrationFlowFunctionSupport integrationFlowFunctionSupport;
@Autowired
@Autowired(required = false)
private StreamFunctionProperties streamFunctionProperties;
public AbstractMessageChannelBinder(String[] headersToEmbed, PP provisioningProvider) {
@@ -194,7 +194,7 @@ public abstract class AbstractMessageChannelBinder<C extends ConsumerProperties,
}
this.postProcessOutputChannel(outputChannel, producerProperties);
if (StringUtils.hasText(this.streamFunctionProperties.getDefinition()) && this.processor == null) {
if (this.streamFunctionProperties != null && StringUtils.hasText(this.streamFunctionProperties.getDefinition()) && this.processor == null) {
outputChannel = this.postProcessOutboundChannelForFunction(outputChannel);
}
@@ -343,7 +343,7 @@ public abstract class AbstractMessageChannelBinder<C extends ConsumerProperties,
try {
ConsumerDestination destination = this.provisioningProvider.provisionConsumerDestination(name, group, properties);
// the function support for the inbound channel is only for Sink
if (StringUtils.hasText(this.streamFunctionProperties.getDefinition()) && this.processor == null) {
if (this.streamFunctionProperties != null && StringUtils.hasText(this.streamFunctionProperties.getDefinition()) && this.processor == null) {
inputChannel = this.postProcessInboundChannelForFunction(inputChannel);
}
if (HeaderMode.embeddedHeaders.equals(properties.getHeaderMode())) {