1
0
Эх сурвалжийг харах

Merge branch 'master' into dev

# Conflicts:
#	pom.xml
everywhere.z 4 сар өмнө
parent
commit
d995faed08

+ 4 - 2
liteflow-core/src/main/java/com/yomahub/liteflow/core/FlowExecutor.java

@@ -576,7 +576,8 @@ public class FlowExecutor {
 		List<Tuple> routeTupleList = new ArrayList<>();
 		for (Chain routeChain : routeChainList){
 			CompletableFuture<Slot> f = CompletableFuture.supplyAsync(
-					() -> doExecute(routeChain.getChainId(), param, finalRequestId, contextBeanClazzArray, contextBeanArray, null, InnerChainTypeEnum.NONE, ChainExecuteModeEnum.ROUTE)
+                    () -> doExecute(routeChain.getChainId(), param, finalRequestId, contextBeanClazzArray, contextBeanArray, null, InnerChainTypeEnum.NONE, ChainExecuteModeEnum.ROUTE),
+					ExecutorHelper.loadInstance().buildWhenExecutor()
 			);
 
 			routeTupleList.add(new Tuple(routeChain, f));
@@ -612,7 +613,8 @@ public class FlowExecutor {
 		List<CompletableFuture<Slot>> executeChainCfList = new ArrayList<>();
 		for (Chain chain : matchedRouteChainList){
 			CompletableFuture<Slot> cf = CompletableFuture.supplyAsync(
-					() -> doExecute(chain.getChainId(), param, finalRequestId, contextBeanClazzArray, contextBeanArray, null, InnerChainTypeEnum.NONE, ChainExecuteModeEnum.BODY)
+					() -> doExecute(chain.getChainId(), param, finalRequestId, contextBeanClazzArray, contextBeanArray, null, InnerChainTypeEnum.NONE, ChainExecuteModeEnum.BODY),
+					ExecutorHelper.loadInstance().buildWhenExecutor()
 			);
 			executeChainCfList.add(cf);
 		}