Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1A7601766E for ; Fri, 15 May 2015 14:02:31 +0000 (UTC) Received: (qmail 10345 invoked by uid 500); 15 May 2015 14:02:31 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 10314 invoked by uid 500); 15 May 2015 14:02:31 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 10305 invoked by uid 99); 15 May 2015 14:02:30 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 May 2015 14:02:30 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 86EC01A2D00 for ; Fri, 15 May 2015 14:02:30 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id Ovn9QD09o2aA for ; Fri, 15 May 2015 14:02:18 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id B616B28312 for ; Fri, 15 May 2015 14:02:03 +0000 (UTC) Received: (qmail 7357 invoked by uid 99); 15 May 2015 14:02:03 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 May 2015 14:02:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 94CCEE35A2; Fri, 15 May 2015 14:02:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 15 May 2015 14:02:35 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Fri May 15 13:37:34 2015 +0300 Committer: sevdokimov 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() { + ignite2.message().remoteListen(null, new P2() { @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 rcvMsgs = new GridConcurrentHashSet<>(); - final CountDownLatch rcvLatch = new CountDownLatch(4); + rcvLatch = new CountDownLatch(4); ignite2.message().remoteListen(null, new P2() { @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() { @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() { @IgniteInstanceResource