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 4290818074 for ; Wed, 11 Nov 2015 10:46:36 +0000 (UTC) Received: (qmail 70709 invoked by uid 500); 11 Nov 2015 10:46:31 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 70558 invoked by uid 500); 11 Nov 2015 10:46:31 -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 69584 invoked by uid 99); 11 Nov 2015 10:46:30 -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; Wed, 11 Nov 2015 10:46:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1B44DE0942; Wed, 11 Nov 2015 10:46:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dmagda@apache.org To: commits@ignite.apache.org Date: Wed, 11 Nov 2015 10:46:58 -0000 Message-Id: In-Reply-To: <39bcf58a017345afb9e88359ad671ce4@git.apache.org> References: <39bcf58a017345afb9e88359ad671ce4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [30/48] ignite git commit: Ignite-1093 Backward compatibility failover. Ignite-1093 Backward compatibility failover. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6ea3b5cb Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6ea3b5cb Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6ea3b5cb Branch: refs/heads/ignite-cont-merge Commit: 6ea3b5cbcdfb97ca07e290924068f692a52679fd Parents: 4ab2bd3 Author: Anton Vinogradov Authored: Mon Nov 9 15:09:36 2015 +0300 Committer: Anton Vinogradov Committed: Mon Nov 9 19:04:52 2015 +0300 ---------------------------------------------------------------------- .../distributed/dht/preloader/GridDhtPartitionDemander.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6ea3b5cb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java index 35cedf9..29ca5f4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java @@ -1191,7 +1191,7 @@ public class GridDhtPartitionDemander { // While. // ===== - while (!topologyChanged(fut)) { + while (!fut.isDone() && !topologyChanged(fut)) { SupplyMessage s = poll(msgQ, timeout); // If timed out. @@ -1350,7 +1350,7 @@ public class GridDhtPartitionDemander { } } } - while (retry && !topologyChanged(fut)); + while (retry && !fut.isDone() && !topologyChanged(fut)); } finally { cctx.io().removeOrderedHandler(d.topic());