You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/09/02 12:24:02 UTC

[1/2] ignite git commit: Fixed test.

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.4 da29a706f -> 2c236ac40


Fixed test.


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

Branch: refs/heads/ignite-1.4
Commit: 144bd4a3679a0c1720bf602c892d6934d3af94a4
Parents: 7016bd9
Author: sboikov <sb...@gridgain.com>
Authored: Wed Sep 2 13:23:27 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Sep 2 13:23:27 2015 +0300

----------------------------------------------------------------------
 .../distributed/GridCachePartitionNotLoadedEventSelfTest.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/144bd4a3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java
index 9ef99f7..e712cc9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java
@@ -89,7 +89,7 @@ public class GridCachePartitionNotLoadedEventSelfTest extends GridCommonAbstract
     }
 
     /**
-     *
+     * @throws Exception If failed.
      */
     public void testPrimaryAndBackupDead() throws Exception {
         backupCnt = 1;
@@ -131,12 +131,14 @@ public class GridCachePartitionNotLoadedEventSelfTest extends GridCommonAbstract
     }
 
     /**
-     *
+     * @throws Exception If failed.
      */
     public void testPrimaryDead() throws Exception {
         startGrid(0);
         startGrid(1);
 
+        awaitPartitionMapExchange();
+
         PartitionNotFullyLoadedListener lsnr = new PartitionNotFullyLoadedListener();
 
         ignite(1).events().localListen(lsnr, EventType.EVT_CACHE_REBALANCE_PART_DATA_LOST);


[2/2] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4

Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4


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

Branch: refs/heads/ignite-1.4
Commit: 2c236ac4063f31f316bf6d9003ad216e8a1fb124
Parents: 144bd4a da29a70
Author: sboikov <sb...@gridgain.com>
Authored: Wed Sep 2 13:23:55 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Sep 2 13:23:55 2015 +0300

----------------------------------------------------------------------
 .../processors/platform/lifecycle/PlatformLifecycleBean.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------