You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/04/06 10:45:59 UTC
[22/50] [abbrv] ignite git commit: IGNITE-4284 - Fix. Failed second
client node join with continuous query and peer class loading enabled.
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-3477-master
Commit: d4979b87e3301f11f52531645028ecd4e947986b
Parents: 45a4cfe
Author: dkarachentsev <dk...@gridgain.com>
Authored: Thu Mar 30 17:35:28 2017 +0300
Committer: dkarachentsev <dk...@gridgain.com>
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);
+ }
}
}