This is an automated email from the ASF dual-hosted git repository.
dgovorukhin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 0fddf1a IGNITE-10909 Fix
GridServiceProcessorBatchDeploySelfTest.testDeployAllTopologyChange flaky fail
with NPE in Service Grid (legacy mode) - Fixes #5815.
0fddf1a is described below
commit 0fddf1a8b46482e3d0016b48e2cc9ba4bde026fb
Author: Dmitriy Govorukhin <[email protected]>
AuthorDate: Tue Dec 25 14:01:50 2018 +0300
IGNITE-10909 Fix
GridServiceProcessorBatchDeploySelfTest.testDeployAllTopologyChange flaky fail
with NPE in Service Grid (legacy mode) - Fixes #5815.
---
.../ignite/internal/processors/service/GridServiceProcessor.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
index bcdb8e5..f5057cf 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
@@ -642,8 +642,12 @@ public class GridServiceProcessor extends
ServiceProcessorAdapter implements Ign
break;
}
catch (IgniteException | IgniteCheckedException e) {
- for (String name : res.servicesToRollback())
- depFuts.remove(name).onDone(e);
+ for (String name : res.servicesToRollback()) {
+ GridServiceDeploymentFuture<String> fut;
+
+ if ((fut = depFuts.remove(name)) != null)
+ fut.onDone(e);
+ }
if (X.hasCause(e, ClusterTopologyCheckedException.class)) {
if (log.isDebugEnabled())
