ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [01/50] [abbrv] ignite git commit: Fixed NPE in IgniteProcessProxy.kill() (cherry picked from commit 11bc058)
Date Wed, 01 Mar 2017 14:32:44 GMT
Repository: ignite
Updated Branches:
  refs/heads/master 5456caffc -> cc6257f8c


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/9eb26bd8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9eb26bd8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9eb26bd8

Branch: refs/heads/master
Commit: 9eb26bd83ff57980adb929dddf7d4bd62810bf51
Parents: 7a65281
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Fri Feb 17 18:45:17 2017 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Fri Feb 17 19:02:07 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/9eb26bd8/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 9bb5205..7c62208 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
@@ -234,9 +234,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();


Mime
View raw message