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 66C7818036 for ; Fri, 31 Jul 2015 10:42:00 +0000 (UTC) Received: (qmail 81443 invoked by uid 500); 31 Jul 2015 10:42:00 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 81412 invoked by uid 500); 31 Jul 2015 10:42:00 -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 81403 invoked by uid 99); 31 Jul 2015 10:41:59 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Jul 2015 10:41:59 +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 8EE601A93D6 for ; Fri, 31 Jul 2015 10:41:59 +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 JPo6_NVJF9cM for ; Fri, 31 Jul 2015 10:41:51 +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 D49B220F20 for ; Fri, 31 Jul 2015 10:41:50 +0000 (UTC) Received: (qmail 81391 invoked by uid 99); 31 Jul 2015 10:41:50 -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, 31 Jul 2015 10:41:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 908D2E01C1; Fri, 31 Jul 2015 10:41:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yzhdanov@apache.org To: commits@ignite.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-ignite git commit: Merging IGNITE-1164 Date: Fri, 31 Jul 2015 10:41:50 +0000 (UTC) Repository: incubator-ignite Updated Branches: refs/heads/master 44072f806 -> abb2cef13 Merging IGNITE-1164 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/abb2cef1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/abb2cef1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/abb2cef1 Branch: refs/heads/master Commit: abb2cef136da824c55964bb4032c47dd150242c1 Parents: 44072f8 Author: Denis Magda Authored: Fri Jul 31 13:41:41 2015 +0300 Committer: Yakov Zhdanov Committed: Fri Jul 31 13:41:41 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/abb2cef1/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java index 47ba8e6..90133d6 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java @@ -2759,6 +2759,9 @@ class ServerImpl extends TcpDiscoveryImpl { if (routerNode.id().equals(getLocalNodeId())) { ClientMessageWorker worker = clientMsgWorkers.get(node.id()); + if (worker == null) + throw new IgniteSpiException("Client node already disconnected: " + node); + msg.verify(getLocalNodeId()); // Client worker require verified messages. worker.addMessage(msg);