mirror of
https://gitee.com/dromara/liteFlow.git
synced 2026-05-14 20:22:07 +08:00
bug #IAJR32 修复在ParallelStrategyExecutor可能出现的NPE问题
This commit is contained in:
@@ -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
|
||||
)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -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());
|
||||
|
||||
|
||||
2
pom.xml
2
pom.xml
@@ -39,7 +39,7 @@
|
||||
</scm>
|
||||
|
||||
<properties>
|
||||
<revision>2.12.2.2</revision>
|
||||
<revision>2.12.2.3</revision>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
<maven.compiler.source>8</maven.compiler.source>
|
||||
|
||||
Reference in New Issue
Block a user