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

GH-678 Fix race condition leading to NPE in Azure FunctionInvoker

Browse Source 
Resolves #678
This commit is contained in:
Oleg Zhurakousky
2021-04-06 14:02:04 +02:00
parent 721e6a72c8
commit ba8dd58db6
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/FunctionInvoker.java
View File

@@ -25,7 +25,6 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicBoolean;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.microsoft.azure.functions.ExecutionContext;
@@ -77,18 +76,16 @@ public class FunctionInvoker<I, O> {
private static ConfigurableApplicationContext APPLICATION_CONTEXT;
private static AtomicBoolean initialized = new AtomicBoolean();
private final static Object LOCK = new Object();
private static JsonMapper OBJECT_MAPPER;
public FunctionInvoker(Class<?> configurationClass) {
try {
if (initialized.compareAndSet(false, true)) {
initialize(configurationClass);
}
initialize(configurationClass);
}
catch (Exception e) {
initialized.set(false);
this.close();
throw new IllegalStateException("Failed to initialize", e);
}
}
@@ -102,7 +99,7 @@ public class FunctionInvoker<I, O> {
}
public void close() {
initialized.set(false);
FUNCTION_CATALOG = null;
}
public void handleOutput(I input, OutputBinding<O> binding,
@@ -248,23 +245,27 @@ public class FunctionInvoker<I, O> {
}
private static void initialize(Class<?> configurationClass) {
logger.info("Initializing: " + configurationClass);
SpringApplication builder = springApplication(configurationClass);
APPLICATION_CONTEXT = builder.run();
synchronized (LOCK) {
if (FUNCTION_CATALOG == null) {
logger.info("Initializing: " + configurationClass);
SpringApplication builder = springApplication(configurationClass);
APPLICATION_CONTEXT = builder.run();
Map<String, FunctionCatalog> mf = APPLICATION_CONTEXT.getBeansOfType(FunctionCatalog.class);
if (CollectionUtils.isEmpty(mf)) {
OBJECT_MAPPER = new JacksonMapper(new ObjectMapper());
JsonMessageConverter jsonConverter = new JsonMessageConverter(OBJECT_MAPPER);
SmartCompositeMessageConverter messageConverter = new SmartCompositeMessageConverter(Collections.singletonList(jsonConverter));
FUNCTION_CATALOG = new SimpleFunctionRegistry(APPLICATION_CONTEXT.getBeanFactory().getConversionService(),
messageConverter, OBJECT_MAPPER);
Map<String, FunctionCatalog> mf = APPLICATION_CONTEXT.getBeansOfType(FunctionCatalog.class);
if (CollectionUtils.isEmpty(mf)) {
OBJECT_MAPPER = new JacksonMapper(new ObjectMapper());
JsonMessageConverter jsonConverter = new JsonMessageConverter(OBJECT_MAPPER);
SmartCompositeMessageConverter messageConverter = new SmartCompositeMessageConverter(Collections.singletonList(jsonConverter));
FUNCTION_CATALOG = new SimpleFunctionRegistry(APPLICATION_CONTEXT.getBeanFactory().getConversionService(),
messageConverter, OBJECT_MAPPER);
}
else {
OBJECT_MAPPER = APPLICATION_CONTEXT.getBean(JsonMapper.class);
FUNCTION_CATALOG = mf.values().iterator().next();
}
}
}
}
else {
OBJECT_MAPPER = APPLICATION_CONTEXT.getBean(JsonMapper.class);
FUNCTION_CATALOG = mf.values().iterator().next();
}
}
private static SpringApplication springApplication(Class<?> configurationClass) {