IGNITE-10909 Fix GridServiceProcessorBatchDeploySelfTest.testDeployAllTopologyChange...
authorDmitriy Govorukhin <dmitriy.govorukhin@gmail.com>
Tue, 25 Dec 2018 11:01:50 +0000 (14:01 +0300)
committerDmitriy Govorukhin <dmitriy.govorukhin@gmail.com>
Sat, 12 Jan 2019 13:28:05 +0000 (16:28 +0300)
modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java

index bcdb8e5..f5057cf 100644 (file)
@@ -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())