diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/parallel/CompletableFutureExpand.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/parallel/CompletableFutureExpand.java index 37ba6dbb6..f4a29f5c7 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/parallel/CompletableFutureExpand.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/parallel/CompletableFutureExpand.java @@ -17,7 +17,15 @@ public class CompletableFutureExpand { return future; } - return future.whenComplete(new Canceller(Delayer.delay(new Timeout<>(future, timeoutDefaultObj), timeout, unit))); + return future.whenComplete( + new Canceller( + Delayer.delay( + new Timeout<>(future, timeoutDefaultObj), + timeout, + unit + ) + ) + ); } /** diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/parallel/strategy/ParallelStrategyExecutor.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/parallel/strategy/ParallelStrategyExecutor.java index 8c9333bd1..398b71749 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/parallel/strategy/ParallelStrategyExecutor.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/parallel/strategy/ParallelStrategyExecutor.java @@ -215,7 +215,7 @@ public abstract class ParallelStrategyExecutor { return whenFutureObj; } catch (InterruptedException | ExecutionException e) { interrupted[0] = true; - return null; + return WhenFutureObj.fail("Unknown", e); } }).collect(Collectors.toList()); diff --git a/pom.xml b/pom.xml index ae1d9c243..7aae9ff38 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ - 2.12.2.2 + 2.12.2.3 UTF-8 UTF-8 8