From 2a8c3cdda6ae3c9026acab5e0e811055f9924f7e Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 15 Jan 2020 07:01:18 +0100 Subject: [PATCH] Minor fix to avoid NPE when output content type is not present --- .../context/catalog/BeanFactoryAwareFunctionRegistry.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/BeanFactoryAwareFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java index 24f1b42d5..e285e0745 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 @@ -120,6 +120,7 @@ public class BeanFactoryAwareFunctionRegistry this.applicationContext.getBeanNamesForType(Consumer.class).length; } + @Override @SuppressWarnings("unchecked") public T lookup(String definition, String... acceptedOutputTypes) { Object function = this.proxyInvokerIfNecessary((FunctionInvocationWrapper) this.compose(null, definition, acceptedOutputTypes)); @@ -625,7 +626,7 @@ public class BeanFactoryAwareFunctionRegistry .filter(v -> v != null) .findFirst().orElse(null); } - return convertedValue; + return convertedValue != null ? convertedValue : value; }