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 CDE58186BC for ; Fri, 12 Jun 2015 10:40:47 +0000 (UTC) Received: (qmail 30335 invoked by uid 500); 12 Jun 2015 10:40:47 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 30302 invoked by uid 500); 12 Jun 2015 10:40:47 -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 30293 invoked by uid 99); 12 Jun 2015 10:40:47 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Jun 2015 10:40:47 +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 082CA18221F for ; Fri, 12 Jun 2015 10:40:47 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] 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 D8yfP4UWykmp for ; Fri, 12 Jun 2015 10:40:39 +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 88F6447BC9 for ; Fri, 12 Jun 2015 10:40:38 +0000 (UTC) Received: (qmail 28085 invoked by uid 99); 12 Jun 2015 10:39:23 -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, 12 Jun 2015 10:39:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EEB25DFF09; Fri, 12 Jun 2015 10:39:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 12 Jun 2015 10:39:21 -0000 Message-Id: <93fb79dbe07b4b60a6386bcbb12cb91c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/7] incubator-ignite git commit: #ignite-994: inject ignite before using. Repository: incubator-ignite Updated Branches: refs/heads/ignite-gg-10404 32697ab08 -> c62c410bc #ignite-994: inject ignite before using. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5db09734 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5db09734 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5db09734 Branch: refs/heads/ignite-gg-10404 Commit: 5db097342411abe6dbdd3d1f9c70029b3b497aff Parents: 8f455a9 Author: ivasilinets Authored: Wed Jun 10 15:38:17 2015 +0300 Committer: ivasilinets Committed: Wed Jun 10 15:38:17 2015 +0300 ---------------------------------------------------------------------- .../continuous/GridContinuousProcessor.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5db09734/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java index 38d970b..dd04bf4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java @@ -343,16 +343,19 @@ public class GridContinuousProcessor extends GridProcessorAdapter { if (!ctx.isDaemon() && data != null) { for (DiscoveryDataItem item : data.items) { - // Register handler only if local node passes projection predicate. - if (item.prjPred == null || item.prjPred.apply(ctx.discovery().localNode())) { - try { + try { + if (item.prjPred != null) + ctx.resource().injectGeneric(item.prjPred); + + // Register handler only if local node passes projection predicate. + if (item.prjPred == null || item.prjPred.apply(ctx.discovery().localNode())) { if (registerHandler(data.nodeId, item.routineId, item.hnd, item.bufSize, item.interval, item.autoUnsubscribe, false)) item.hnd.onListenerRegistered(item.routineId, ctx); } - catch (IgniteCheckedException e) { - U.error(log, "Failed to register continuous handler.", e); - } + } + catch (IgniteCheckedException e) { + U.error(log, "Failed to register continuous handler.", e); } }