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

GH-2160 Fix NPE in MessageConverterConfigurer

Browse Source 
Resolves #2160
This commit is contained in:
Oleg Zhurakousky
2021-05-05 15:40:25 +02:00
parent b2bb645cf1
commit e8539e589a
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/MessageConverterConfigurer.java
View File

@@ -163,9 +163,7 @@ public class MessageConverterConfigurer
}
else {
if (environment != null && environment.containsProperty("spring.cloud.stream.rabbit.bindings." + channelName + ".producer.routing-key-expression")) {
FunctionCatalog catalog = this.beanFactory.getBean(FunctionCatalog.class);
FunctionInvocationWrapper function = catalog.lookup(this.streamFunctionProperties.getDefinition());
function.setSkipOutputConversion(true);
this.setSkipOutputConversionIfNecessary();
functional = false;
}
if (!functional) {
@@ -175,6 +173,16 @@ public class MessageConverterConfigurer
}
}
private void setSkipOutputConversionIfNecessary() {
FunctionCatalog catalog = this.beanFactory.getBean(FunctionCatalog.class);
if (catalog != null) {
FunctionInvocationWrapper function = catalog.lookup(this.streamFunctionProperties.getDefinition());
if (function != null) {
function.setSkipOutputConversion(true);
}
}
}
private boolean isNativeEncodingNotSet(ProducerProperties producerProperties,
ConsumerProperties consumerProperties, boolean input) {
if (input) {