Fix GridServiceProcessorBatchDeploySelfTest.testDeployAllTopologyChange flaky fail with NPE in Service Grid (legacy mode) - Fixes
@@ -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())
