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

Fix conversion logic in SmartCompositeMessageConverter

Browse Source
This commit is contained in:
Oleg Zhurakousky
2022-03-25 14:24:18 +01:00
parent 19dc7ca7da
commit f0bdf80ac4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java
View File

@@ -45,7 +45,7 @@ public class SmartCompositeMessageConverter extends CompositeMessageConverter {
@Nullable @Nullable
public Object fromMessage(Message<?> message, Class<?> targetClass) { public Object fromMessage(Message<?> message, Class<?> targetClass) {
for (MessageConverter converter : getConverters()) { for (MessageConverter converter : getConverters()) {
if (targetClass.isInstance(message.getPayload()) && !(message.getPayload() instanceof Collection<?>)) { if (!(message.getPayload() instanceof byte[]) && targetClass.isInstance(message.getPayload()) && !(message.getPayload() instanceof Collection<?>)) {
return message.getPayload(); return message.getPayload();
} }
Object result = converter.fromMessage(message, targetClass); Object result = converter.fromMessage(message, targetClass);
@@ -60,7 +60,7 @@ public class SmartCompositeMessageConverter extends CompositeMessageConverter {
@Nullable @Nullable
public Object fromMessage(Message<?> message, Class<?> targetClass, @Nullable Object conversionHint) { public Object fromMessage(Message<?> message, Class<?> targetClass, @Nullable Object conversionHint) {
for (MessageConverter converter : getConverters()) { for (MessageConverter converter : getConverters()) {
if (targetClass.isInstance(message.getPayload()) && !(message.getPayload() instanceof Collection<?>)) { if (!(message.getPayload() instanceof byte[]) && targetClass.isInstance(message.getPayload()) && !(message.getPayload() instanceof Collection<?>)) {
return message.getPayload(); return message.getPayload();
} }
Object result = (converter instanceof SmartMessageConverter ? Object result = (converter instanceof SmartMessageConverter ?