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/05/15 16:02:35 UTC
[33/47] incubator-ignite git commit: IGNITE-836 Fix
GridMessagingNoPeerClassLoadingSelfTest.
IGNITE-836 Fix GridMessagingNoPeerClassLoadingSelfTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/784c088e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/784c088e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/784c088e
Branch: refs/heads/ignite-709_3
Commit: 784c088ec9a3c4fdfde30637e374018ea883e2b9
Parents: 668746f
Author: sevdokimov <se...@gridgain.com>
Authored: Fri May 15 13:37:34 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Fri May 15 13:37:34 2015 +0300
----------------------------------------------------------------------
.../GridMessagingNoPeerClassLoadingSelfTest.java | 7 +++++--
.../apache/ignite/messaging/GridMessagingSelfTest.java | 13 ++++++++-----
2 files changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/784c088e/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingNoPeerClassLoadingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingNoPeerClassLoadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingNoPeerClassLoadingSelfTest.java
index 610ce64..37d2ec7 100644
--- a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingNoPeerClassLoadingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingNoPeerClassLoadingSelfTest.java
@@ -31,6 +31,9 @@ import java.util.concurrent.atomic.*;
* peer class loading.
*/
public class GridMessagingNoPeerClassLoadingSelfTest extends GridMessagingSelfTest {
+ /** */
+ private static CountDownLatch rcvLatch;
+
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
@@ -56,9 +59,9 @@ public class GridMessagingNoPeerClassLoadingSelfTest extends GridMessagingSelfTe
final AtomicBoolean error = new AtomicBoolean(false); //to make it modifiable
- final CountDownLatch rcvLatch = new CountDownLatch(1);
+ rcvLatch = new CountDownLatch(1);
- ignite2.message().remoteListen("", new P2<UUID, Object>() {
+ ignite2.message().remoteListen(null, new P2<UUID, Object>() {
@Override public boolean apply(UUID nodeId, Object msg) {
try {
log.info("Received new message [msg=" + msg + ", senderNodeId=" + nodeId + ']');
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/784c088e/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
index c033750..b7838be 100644
--- a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
@@ -45,7 +45,7 @@ import static org.apache.ignite.testframework.GridTestUtils.*;
/**
* Various tests for Messaging public API.
*/
-public class GridMessagingSelfTest extends GridCommonAbstractTest {
+public class GridMessagingSelfTest extends GridCommonAbstractTest implements Serializable {
/** */
private static final String MSG_1 = "MSG-1";
@@ -74,7 +74,10 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest {
public static final String EXT_RESOURCE_CLS_NAME = "org.apache.ignite.tests.p2p.TestUserResource";
/** Shared IP finder. */
- private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
+ private final transient TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
+
+ /** */
+ protected static CountDownLatch rcvLatch;
/**
* A test message topic.
@@ -609,7 +612,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest {
public void testRemoteListen() throws Exception {
final Collection<Object> rcvMsgs = new GridConcurrentHashSet<>();
- final CountDownLatch rcvLatch = new CountDownLatch(4);
+ rcvLatch = new CountDownLatch(4);
ignite2.message().remoteListen(null, new P2<UUID, Object>() {
@Override public boolean apply(UUID nodeId, Object msg) {
@@ -746,7 +749,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest {
final AtomicBoolean error = new AtomicBoolean(false); //to make it modifiable
- final CountDownLatch rcvLatch = new CountDownLatch(3);
+ rcvLatch = new CountDownLatch(3);
ignite2.message().remoteListen(S_TOPIC_1, new P2<UUID, Object>() {
@Override public boolean apply(UUID nodeId, Object msg) {
@@ -795,7 +798,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest {
final AtomicBoolean error = new AtomicBoolean(false); //to make it modifiable
- final CountDownLatch rcvLatch = new CountDownLatch(3);
+ rcvLatch = new CountDownLatch(3);
ignite2.message().remoteListen(I_TOPIC_1, new P2<UUID, Object>() {
@IgniteInstanceResource