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 7C31010A93 for ; Mon, 27 Apr 2015 12:30:59 +0000 (UTC) Received: (qmail 86352 invoked by uid 500); 27 Apr 2015 12:30:59 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 86324 invoked by uid 500); 27 Apr 2015 12:30:59 -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 86315 invoked by uid 99); 27 Apr 2015 12:30:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Apr 2015 12:30:59 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of root@apache.org designates 54.164.171.186 as permitted sender) Received: from [54.164.171.186] (HELO mx1-us-east.apache.org) (54.164.171.186) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Apr 2015 12:30:53 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 6F4874544D for ; Mon, 27 Apr 2015 12:30:01 +0000 (UTC) Received: (qmail 84256 invoked by uid 99); 27 Apr 2015 12:30:00 -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; Mon, 27 Apr 2015 12:30:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A8661E179A; Mon, 27 Apr 2015 12:30:00 +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: Mon, 27 Apr 2015 12:30:32 -0000 Message-Id: <19a9b357626b4dd69aa07eb0b0cbf4b6@git.apache.org> In-Reply-To: <28c7ca0d0d29409ea7a7d8df5ea00f0d@git.apache.org> References: <28c7ca0d0d29409ea7a7d8df5ea00f0d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [33/50] incubator-ignite git commit: minor X-Virus-Checked: Checked by ClamAV on apache.org minor Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ef29f794 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ef29f794 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ef29f794 Branch: refs/heads/ignite-648 Commit: ef29f7940e4fff0ef8830d8d2b6fb1e9b2f5a5bc Parents: 5a1faf9 Author: Yakov Zhdanov Authored: Fri Apr 24 09:54:13 2015 +0300 Committer: Yakov Zhdanov Committed: Fri Apr 24 09:54:13 2015 +0300 ---------------------------------------------------------------------- .../processors/affinity/GridAffinityAssignmentCache.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef29f794/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java index 409419c..eccd9f9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java @@ -133,7 +133,7 @@ public class GridAffinityAssignmentCache { stopping = true; IgniteCheckedException err = - new IgniteCheckedException("Failed to wait for topology update, node is stopping."); + new IgniteCheckedException("Failed to wait for topology update, cache (or node) is stopping."); for (AffinityReadyFuture fut : readyFuts.values()) fut.onDone(err); @@ -282,7 +282,7 @@ public class GridAffinityAssignmentCache { fut.onDone(topVer); } else if (stopping) - fut.onDone(new IgniteCheckedException("Failed to wait for topology update, node is stopping.")); + fut.onDone(new IgniteCheckedException("Failed to wait for topology update, cache (or node) is stopping.")); return fut; }