From 41acbfd4385e216458ae3ceba6b78b2c3fe34948 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 7 May 2020 10:33:45 +0200 Subject: [PATCH] Fix Message unwrapping condition --- .../cloud/function/context/catalog/SimpleFunctionRegistry.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java index 8f4b35210..dac8a7d6f 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java @@ -532,7 +532,8 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect private Object invokeFunction(Object input) { Message incomingMessage = null; if (!this.functionDefinition.startsWith(RoutingFunction.FUNCTION_NAME)) { - if (input instanceof Message && !FunctionTypeUtils.isMessage(FunctionTypeUtils.getInputType(functionType, 0)) + if (input instanceof Message + && !FunctionTypeUtils.isMessage(FunctionTypeUtils.getInputType(functionType, 0)) && ((Message) input).getHeaders().containsKey("scf-func-name")) { incomingMessage = (Message) input; input = incomingMessage.getPayload();