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 8B020200C4E for ; Thu, 6 Apr 2017 11:31:55 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 89F34160B83; Thu, 6 Apr 2017 09:31:55 +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 A3047160BB1 for ; Thu, 6 Apr 2017 11:31:54 +0200 (CEST) Received: (qmail 16131 invoked by uid 500); 6 Apr 2017 09:31:53 -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 15546 invoked by uid 99); 6 Apr 2017 09:31:53 -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; Thu, 06 Apr 2017 09:31:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B26BFE9635; Thu, 6 Apr 2017 09:31:52 +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: Thu, 06 Apr 2017 09:31:58 -0000 Message-Id: <6115061e8079458ea90618bebbb18de5@git.apache.org> In-Reply-To: <3ba27144dbdb41f0bb9f3db0049366f4@git.apache.org> References: <3ba27144dbdb41f0bb9f3db0049366f4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/50] [abbrv] ignite git commit: IGNITE-4284 - Fix. Failed second client node join with continuous query and peer class loading enabled. archived-at: Thu, 06 Apr 2017 09:31:55 -0000 IGNITE-4284 - Fix. Failed second client node join with continuous query and peer class loading enabled. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d4979b87 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d4979b87 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d4979b87 Branch: refs/heads/ignite-4003 Commit: d4979b87e3301f11f52531645028ecd4e947986b Parents: 45a4cfe Author: dkarachentsev Authored: Thu Mar 30 17:35:28 2017 +0300 Committer: dkarachentsev Committed: Thu Mar 30 17:35:28 2017 +0300 ---------------------------------------------------------------------- .../continuous/GridContinuousProcessor.java | 35 +++++++++----------- 1 file changed, 15 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d4979b87/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 6a4f57d..391c266 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 @@ -503,28 +503,23 @@ public class GridContinuousProcessor extends GridProcessorAdapter { UUID routineId = e.getKey(); LocalRoutineInfo info = e.getValue(); - GridCacheContext cctx = ctx.cache().context().cacheContext(CU.cacheId(info.hnd.cacheName())); - - // Do not register handler if it's not affinity node. - if (cctx == null || cctx.affinityNode()) { - try { - if (info.prjPred != null) - ctx.resource().injectGeneric(info.prjPred); - - if (info.prjPred == null || info.prjPred.apply(ctx.discovery().localNode())) { - registerHandler(clientNodeId, - routineId, - info.hnd, - info.bufSize, - info.interval, - info.autoUnsubscribe, - false); - } - } - catch (IgniteCheckedException err) { - U.error(log, "Failed to register continuous handler.", err); + try { + if (info.prjPred != null) + ctx.resource().injectGeneric(info.prjPred); + + if (info.prjPred == null || info.prjPred.apply(ctx.discovery().localNode())) { + registerHandler(clientNodeId, + routineId, + info.hnd, + info.bufSize, + info.interval, + info.autoUnsubscribe, + false); } } + catch (IgniteCheckedException err) { + U.error(log, "Failed to register continuous handler.", err); + } } }