Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 587A0200BF0 for ; Fri, 30 Dec 2016 10:11:26 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 5702F160B32; Fri, 30 Dec 2016 09:11:26 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A320D160B24 for ; Fri, 30 Dec 2016 10:11:25 +0100 (CET) Received: (qmail 24690 invoked by uid 500); 30 Dec 2016 09:11:24 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 24681 invoked by uid 99); 30 Dec 2016 09:11:24 -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, 30 Dec 2016 09:11:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AC2F4DFC11; Fri, 30 Dec 2016 09:11:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: Fixed 'directType' conflict for test message. Date: Fri, 30 Dec 2016 09:11:24 +0000 (UTC) archived-at: Fri, 30 Dec 2016 09:11:26 -0000 Repository: ignite Updated Branches: refs/heads/ignite-3477 6f47f44c4 -> d139e6476 Fixed 'directType' conflict for test message. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d139e647 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d139e647 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d139e647 Branch: refs/heads/ignite-3477 Commit: d139e6476d5ef6de3b79d2f33081821b50b2a969 Parents: 6f47f44 Author: sboikov Authored: Fri Dec 30 12:11:22 2016 +0300 Committer: sboikov Committed: Fri Dec 30 12:11:22 2016 +0300 ---------------------------------------------------------------------- .../cache/GridChangeGlobalStateMessageResponse.java | 2 +- .../communication/GridCommunicationSendMessageSelfTest.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d139e647/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java index 4a7cfb7..fafc71f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java @@ -30,7 +30,7 @@ import org.apache.ignite.plugin.extensions.communication.MessageWriter; /** * */ -public class GridChangeGlobalStateMessageResponse extends GridCacheMessage{ +public class GridChangeGlobalStateMessageResponse extends GridCacheMessage { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/ignite/blob/d139e647/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java index 8503b48..e4eda77 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java @@ -21,7 +21,6 @@ import java.nio.ByteBuffer; import java.util.UUID; import java.util.concurrent.CountDownLatch; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.internal.util.typedef.CO; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.plugin.extensions.communication.MessageReader; @@ -47,7 +46,7 @@ public class GridCommunicationSendMessageSelfTest extends GridCommonAbstractTest private static final int SAMPLE_CNT = 1; /** */ - private static final byte DIRECT_TYPE = (byte)210; + private static final byte DIRECT_TYPE = -100; /** */ private int bufSize; @@ -113,8 +112,8 @@ public class GridCommunicationSendMessageSelfTest extends GridCommonAbstractTest * @throws Exception If failed. */ private void doSend() throws Exception { - GridIoManager mgr0 = ((IgniteKernal)grid(0)).context().io(); - GridIoManager mgr1 = ((IgniteKernal)grid(1)).context().io(); + GridIoManager mgr0 = grid(0).context().io(); + GridIoManager mgr1 = grid(1).context().io(); String topic = "test-topic";