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 5BED1181C4 for ; Fri, 13 Nov 2015 11:22:11 +0000 (UTC) Received: (qmail 29493 invoked by uid 500); 13 Nov 2015 11:22:11 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 29415 invoked by uid 500); 13 Nov 2015 11:22:11 -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 29346 invoked by uid 99); 13 Nov 2015 11:22:11 -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, 13 Nov 2015 11:22:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1BA1EE0254; Fri, 13 Nov 2015 11:22:11 +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: Fri, 13 Nov 2015 11:22:11 -0000 Message-Id: <05c5261681334708bc9207480b53d1c3@git.apache.org> In-Reply-To: <6c45991afff6423f9763dc475eaba5bc@git.apache.org> References: <6c45991afff6423f9763dc475eaba5bc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] ignite git commit: Ignite-1093 Backward compatibility fix. Ignite-1093 Backward compatibility fix. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c9cea766 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c9cea766 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c9cea766 Branch: refs/heads/master Commit: c9cea76656fb00c03811350260bd158ffdf8739a Parents: 7a40364 Author: Anton Vinogradov Authored: Fri Nov 13 14:19:13 2015 +0300 Committer: Anton Vinogradov Committed: Fri Nov 13 14:19:13 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/preloader/GridDhtPartitionSupplier.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c9cea766/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java index 865bad8..4e33d8e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java @@ -759,6 +759,9 @@ class GridDhtPartitionSupplier { ClusterNode node = cctx.node(id); + if (node == null) + return; + long preloadThrottle = cctx.config().getRebalanceThrottle(); boolean ack = false;