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/06/26 16:08:07 UTC
incubator-ignite git commit: # ignite-648: remove grod count and
waiting logic (2)
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-648 cb4e55708 -> d1ac4dcc6
# ignite-648: remove grod count and waiting logic (2)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d1ac4dcc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d1ac4dcc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d1ac4dcc
Branch: refs/heads/ignite-648
Commit: d1ac4dcc6d25a6d53d4851da80b7a0396315202d
Parents: cb4e557
Author: ashutak <as...@gridgain.com>
Authored: Fri Jun 26 17:08:41 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Fri Jun 26 17:08:41 2015 +0300
----------------------------------------------------------------------
.../testframework/junits/GridAbstractTest.java | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1ac4dcc/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git 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
index 3ecbe19..77a5537 100644
--- 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
@@ -104,18 +104,6 @@ public abstract class GridAbstractTest extends TestCase {
/** Starting grid name. */
protected static ThreadLocal<String> startingGrid = new ThreadLocal<>();
- /** All nodes join latch (for multi JVM mode). */
- private CountDownLatch allNodesJoinLatch;
-
- /** Node join listener (for multi JVM mode). */
- private final IgnitePredicate<Event> nodeJoinLsnr = new IgnitePredicate<Event>() {
- @Override public boolean apply(Event evt) {
- allNodesJoinLatch.countDown();
-
- return true;
- }
- };
-
/**
*
*/
@@ -1079,14 +1067,9 @@ public abstract class GridAbstractTest extends TestCase {
cfg.setNodeId(UUID.fromString(new String(chars)));
}
- if (isMultiJvm()) {
+ if (isMultiJvm())
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(LOCAL_IP_FINDER);
- cfg.setLocalEventListeners(new HashMap<IgnitePredicate<? extends Event>, int[]>() {{
- put(nodeJoinLsnr, new int[] {EventType.EVT_NODE_JOINED});
- }});
- }
-
return cfg;
}