From 2217d8aacee50537e86b7e66f9b24bdeada3688b Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 23 Sep 2019 11:27:09 -0400 Subject: [PATCH] Polishing --- .../context/catalog/BeanFactoryAwareFunctionRegistry.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java index bcab01f96..da7c01f57 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java @@ -671,8 +671,10 @@ public class BeanFactoryAwareFunctionRegistry } private boolean messageNeedsConversion(Type rawType, Message message) { - String skipConversion = message.getHeaders().get(FunctionProperties.SKIP_CONVERSION_HEADER, String.class); - if (StringUtils.hasText(skipConversion) && Boolean.valueOf(skipConversion)) { + Boolean skipConversion = message.getHeaders().containsKey(FunctionProperties.SKIP_CONVERSION_HEADER) + ? message.getHeaders().get(FunctionProperties.SKIP_CONVERSION_HEADER, Boolean.class) + : false; + if (skipConversion) { return false; } return rawType instanceof Class