You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dg...@apache.org on 2019/02/11 18:42:46 UTC
[ignite] branch master updated: IGNITE-10908 Fixed NPE in case of
failure of service deployment - Fixes #6077.
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 5551faa IGNITE-10908 Fixed NPE in case of failure of service deployment - Fixes #6077.
5551faa is described below
commit 5551faa9ce967245ba6a3c4c4c963c4d64c5f764
Author: Slava Koptilin <sl...@gmail.com>
AuthorDate: Mon Feb 11 21:42:19 2019 +0300
IGNITE-10908 Fixed NPE in case of failure of service deployment - Fixes #6077.
Signed-off-by: Dmitriy Govorukhin <dm...@gmail.com>
---
.../internal/processors/service/GridServiceDeploymentFuture.java | 7 -------
.../ignite/internal/processors/service/GridServiceProcessor.java | 4 ++--
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentFuture.java
index ba4422e..2910394 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentFuture.java
@@ -34,13 +34,6 @@ public class GridServiceDeploymentFuture<T extends Serializable> extends GridFut
/**
* @param cfg Configuration.
- */
- public GridServiceDeploymentFuture(ServiceConfiguration cfg) {
- this(cfg, null);
- }
-
- /**
- * @param cfg Configuration.
* @param srvcId Service id.
*/
public GridServiceDeploymentFuture(ServiceConfiguration cfg, T srvcId) {
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 c3f5d92..2b6e050 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
@@ -566,7 +566,7 @@ public class GridServiceProcessor extends ServiceProcessorAdapter implements Ign
if (failedFuts == null)
failedFuts = new ArrayList<>();
- GridServiceDeploymentFuture<String> fut = new GridServiceDeploymentFuture<>(cfg);
+ GridServiceDeploymentFuture<String> fut = new GridServiceDeploymentFuture<>(cfg, cfg.getName());
fut.onDone(err);
@@ -700,7 +700,7 @@ public class GridServiceProcessor extends ServiceProcessorAdapter implements Ign
throws IgniteCheckedException {
String name = cfg.getName();
- GridServiceDeploymentFuture<String> fut = new GridServiceDeploymentFuture<>(cfg);
+ GridServiceDeploymentFuture<String> fut = new GridServiceDeploymentFuture<>(cfg, name);
GridServiceDeploymentFuture<String> old = depFuts.putIfAbsent(name, fut);