From f0bdf80ac42e0e37bcb64b008ddba140034ad2ee Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Fri, 25 Mar 2022 14:24:18 +0100 Subject: [PATCH] Fix conversion logic in SmartCompositeMessageConverter --- .../context/config/SmartCompositeMessageConverter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java index 30caee18b..5b62325f1 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/SmartCompositeMessageConverter.java @@ -45,7 +45,7 @@ public class SmartCompositeMessageConverter extends CompositeMessageConverter { @Nullable public Object fromMessage(Message message, Class targetClass) { 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(); } Object result = converter.fromMessage(message, targetClass); @@ -60,7 +60,7 @@ public class SmartCompositeMessageConverter extends CompositeMessageConverter { @Nullable public Object fromMessage(Message message, Class targetClass, @Nullable Object conversionHint) { 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(); } Object result = (converter instanceof SmartMessageConverter ?