[8/8] incubator-ignite git commit: Merge branch 'ignite-648' into ignite-648-failover

[sboikov]

Merge branch 'ignite-648' into ignite-648-failover

Conflicts:
        
modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a3f9dc17
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a3f9dc17
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a3f9dc17

Branch: refs/heads/ignite-648-failover
Commit: a3f9dc17d16a6d2bc7bb9e8a708b55ce2f534b66
Parents: d0b8b0d f53094f
Author: ashutak <ashu...@gridgain.com>
Authored: Thu Jul 2 20:40:38 2015 +0300
Committer: ashutak <ashu...@gridgain.com>
Committed: Thu Jul 2 20:40:38 2015 +0300

----------------------------------------------------------------------
 .../cache/GridCacheAbstractFullApiSelfTest.java |  5 +-
 ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java |  3 ++
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 13 ++++-
 .../near/GridCacheNearTxMultiNodeSelfTest.java  | 13 +++--
 ...achePartitionedMultiNodeCounterSelfTest.java |  6 +++
 ...achePartitionedMultiNodeFullApiSelfTest.java | 18 ++++++-
 .../testframework/junits/GridAbstractTest.java  | 55 +++++++++++++-------
 .../junits/common/GridCommonAbstractTest.java   |  4 ++
 .../multijvm/IgniteCacheProcessProxy.java       |  8 ++-
 .../junits/multijvm/IgniteProcessProxy.java     | 18 +++++++
 10 files changed, 113 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a3f9dc17/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --cc 
modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index d05c859,732af54..cd94bb9
--- 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@@ -775,26 -781,29 +781,30 @@@ public abstract class GridAbstractTest 
       * @param cancel Cancel flag.
       */
      protected void stopAllGrids(boolean cancel) {
-         Collection<Ignite> clients = new ArrayList<>();
-         Collection<Ignite> srvs = new ArrayList<>();
- 
-         for (Ignite g : G.allGrids()) {
-             if (g.configuration().getDiscoverySpi().isClientMode())
-                 clients.add(g);
-             else
-                 srvs.add(g);
-         }
+         try {
+             Collection<Ignite> clients = new ArrayList<>();
+             Collection<Ignite> srvs = new ArrayList<>();
+ 
+             for (Ignite g : G.allGrids()) {
+                 if (g.configuration().getDiscoverySpi().isClientMode())
+                     clients.add(g);
+                 else
+                     srvs.add(g);
+             }
  
-         for (Ignite g : clients)
-             stopGrid(g.name(), cancel);
+             for (Ignite g : clients)
+                 stopGrid(g.name(), cancel);
  
-         for (Ignite g : srvs)
-             stopGrid(g.name(), cancel);
+             for (Ignite g : srvs)
+                 stopGrid(g.name(), cancel);
  
-         if (isMultiJvm())
+             assert G.allGrids().isEmpty();
+         }
+         finally {
+             IgniteProcessProxy.killAll(); // In multi jvm case.
 +            IgniteNodeRunner.killAll();
+         }
  
-         assert G.allGrids().isEmpty();
      }
  
      /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a3f9dc17/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
----------------------------------------------------------------------