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 048BB200CD7 for ; Tue, 1 Aug 2017 14:57:24 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 02A78167087; Tue, 1 Aug 2017 12:57:24 +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 498D9167085 for ; Tue, 1 Aug 2017 14:57:23 +0200 (CEST) Received: (qmail 29592 invoked by uid 500); 1 Aug 2017 12:57:21 -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 29583 invoked by uid 99); 1 Aug 2017 12:57:21 -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, 01 Aug 2017 12:57:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8FCF7E02F3; Tue, 1 Aug 2017 12:57:21 +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 Date: Tue, 01 Aug 2017 12:57:21 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] ignite git commit: ignite-5578 archived-at: Tue, 01 Aug 2017 12:57:24 -0000 Repository: ignite Updated Branches: refs/heads/ignite-5578 81389d19e -> 2ae3abd7d ignite-5578 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d8ecb995 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d8ecb995 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d8ecb995 Branch: refs/heads/ignite-5578 Commit: d8ecb995bf45d0add8b3f191e2d191ee29bec878 Parents: 81389d1 Author: sboikov Authored: Tue Aug 1 13:39:05 2017 +0300 Committer: sboikov Committed: Tue Aug 1 13:39:05 2017 +0300 ---------------------------------------------------------------------- .../dht/preloader/GridDhtPartitionsExchangeFuture.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d8ecb995/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index eff407f36..d04974a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -1570,6 +1570,10 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte return wait; } + /** + * @param fut Current future. + * @return Pending join request if any. + */ @Nullable public GridDhtPartitionsSingleMessage mergeJoinExchangeOnDone(GridDhtPartitionsExchangeFuture fut) { synchronized (this) { assert !isDone();