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 997FC18646 for ; Tue, 23 Jun 2015 13:52:53 +0000 (UTC) Received: (qmail 36533 invoked by uid 500); 23 Jun 2015 13:52:53 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 36502 invoked by uid 500); 23 Jun 2015 13:52:53 -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 36450 invoked by uid 99); 23 Jun 2015 13:52:53 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Jun 2015 13:52:53 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id F304DCFB1D for ; Tue, 23 Jun 2015 13:52:52 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.353 X-Spam-Level: X-Spam-Status: No, score=0.353 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.428, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id hMTm1cRpH418 for ; Tue, 23 Jun 2015 13:52:45 +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 D940421F26 for ; Tue, 23 Jun 2015 13:52:44 +0000 (UTC) Received: (qmail 36086 invoked by uid 99); 23 Jun 2015 13:52:44 -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; Tue, 23 Jun 2015 13:52:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 86DBAE363A; Tue, 23 Jun 2015 13:52:44 +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: Tue, 23 Jun 2015 13:52:48 -0000 Message-Id: In-Reply-To: <9ac96a394a1a40e2a9210d026a2562b9@git.apache.org> References: <9ac96a394a1a40e2a9210d026a2562b9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/33] incubator-ignite git commit: # ignite-sprint-6 fixed NPE in comm spi unit tests # ignite-sprint-6 fixed NPE in comm spi unit tests Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/895771a7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/895771a7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/895771a7 Branch: refs/heads/ignite-950 Commit: 895771a79d8acca3baf06c23bf3f82483ec62d6f Parents: ef4abeb Author: sboikov Authored: Fri Jun 19 13:06:05 2015 +0300 Committer: sboikov Committed: Fri Jun 19 13:06:05 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/895771a7/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java index 84c1a57..bbb9b1c 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java @@ -1458,8 +1458,10 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter } }; + boolean clientMode = Boolean.TRUE.equals(ignite.configuration().isClientMode()); + IgniteBiInClosure queueSizeMonitor = - !ignite.configuration().isClientMode() && slowClientQueueLimit > 0 ? + !clientMode && slowClientQueueLimit > 0 ? new CI2() { @Override public void apply(GridNioSession ses, Integer qSize) { checkClientQueueSize(ses, qSize);