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 8150F18765 for ; Tue, 2 Jun 2015 15:50:46 +0000 (UTC) Received: (qmail 28210 invoked by uid 500); 2 Jun 2015 15:50:46 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 28142 invoked by uid 500); 2 Jun 2015 15:50:46 -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 28126 invoked by uid 99); 2 Jun 2015 15:50:46 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jun 2015 15:50:46 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id CDF42181A4E for ; Tue, 2 Jun 2015 15:50:45 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.79 X-Spam-Level: X-Spam-Status: No, score=0.79 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id AVV9w-jY83EW for ; Tue, 2 Jun 2015 15:50:30 +0000 (UTC) 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 2100347C09 for ; Tue, 2 Jun 2015 15:50:30 +0000 (UTC) Received: (qmail 27225 invoked by uid 99); 2 Jun 2015 15:50:29 -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, 02 Jun 2015 15:50:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8B40FE0AF9; Tue, 2 Jun 2015 15:50:29 +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: Tue, 02 Jun 2015 15:50:34 -0000 Message-Id: <97551f74ece24f158b8c879970af11a8@git.apache.org> In-Reply-To: <79dc1f4cb24b43a795cdd23a92fdf6a8@git.apache.org> References: <79dc1f4cb24b43a795cdd23a92fdf6a8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/10] incubator-ignite git commit: # ignite-sprint-5 potential NPE in syncFuture listener # ignite-sprint-5 potential NPE in syncFuture listener Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/82cfb47c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/82cfb47c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/82cfb47c Branch: refs/heads/ignite-968 Commit: 82cfb47cd652895d517dae50d670f13f7fcb9065 Parents: 45566fe Author: sboikov Authored: Tue Jun 2 16:03:21 2015 +0300 Committer: sboikov Committed: Tue Jun 2 16:03:21 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/preloader/GridDhtPreloader.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/82cfb47c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java index dc81993..1aef18c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.preloader; import org.apache.ignite.*; import org.apache.ignite.cluster.*; +import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.cluster.*; @@ -227,12 +228,14 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { final long start = U.currentTimeMillis(); - if (cctx.config().getRebalanceDelay() >= 0) { - U.log(log, "Starting rebalancing in " + cctx.config().getRebalanceMode() + " mode: " + cctx.name()); + final CacheConfiguration cfg = cctx.config(); + + if (cfg.getRebalanceDelay() >= 0) { + U.log(log, "Starting rebalancing in " + cfg.getRebalanceMode() + " mode: " + cctx.name()); demandPool.syncFuture().listen(new CI1() { @Override public void apply(Object t) { - U.log(log, "Completed rebalancing in " + cctx.config().getRebalanceMode() + " mode " + + U.log(log, "Completed rebalancing in " + cfg.getRebalanceMode() + " mode " + "[cache=" + cctx.name() + ", time=" + (U.currentTimeMillis() - start) + " ms]"); } });