Fixed NPE in IgniteProcessProxy.kill() (cherry picked from commit 11bc058)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9e6b8cce Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9e6b8cce Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9e6b8cce Branch: refs/heads/ignite-gg-8.0.3.ea6-clients-test Commit: 9e6b8ccea36ba2665cbe4e91c59a35a26590f9ae Parents: 4c97f43 Author: Alexey Kuznetsov <[email protected]> Authored: Fri Feb 17 18:45:17 2017 +0700 Committer: AKuznetsov <[email protected]> Committed: Wed Feb 22 22:00:22 2017 +0700 ---------------------------------------------------------------------- .../testframework/junits/multijvm/IgniteProcessProxy.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9e6b8cce/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java index 2ef9c59..4f204c4 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java @@ -241,9 +241,12 @@ public class IgniteProcessProxy implements IgniteEx { * @param gridName Grid name. */ public static void kill(String gridName) { + A.notNull(gridName, "gridName"); + IgniteProcessProxy proxy = gridProxies.get(gridName); - A.notNull(gridName, "gridName"); + if (proxy == null) + return; try { proxy.getProcess().kill();
