Repository: ignite Updated Branches: refs/heads/ignite-80-2 04889cd72 -> 85141d69a
ignite-80 Fixed dynamic cache start future completion Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/85141d69 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/85141d69 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/85141d69 Branch: refs/heads/ignite-80-2 Commit: 85141d69aa0173c9e1fdc098fb603a1fe637a49b Parents: 04889cd Author: sboikov <[email protected]> Authored: Mon Sep 28 12:03:19 2015 +0300 Committer: sboikov <[email protected]> Committed: Mon Sep 28 12:03:19 2015 +0300 ---------------------------------------------------------------------- .../query/continuous/CacheContinuousQueryHandler.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/85141d69/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java index c99e07f..1990e18 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java @@ -30,7 +30,6 @@ import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.cache.CacheEntryEventSerializableFilter; -import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.events.CacheQueryExecutedEvent; import org.apache.ignite.events.CacheQueryReadEvent; import org.apache.ignite.internal.GridKernalContext; @@ -234,13 +233,10 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler { locLsnr.onUpdated(F.<CacheEntryEvent<? extends K, ? extends V>>asList(evt)); else { try { - ClusterNode node = ctx.discovery().node(nodeId); - - if (ctx.config().isPeerClassLoadingEnabled() && node != null) { + if (ctx.config().isPeerClassLoadingEnabled() && ctx.discovery().node(nodeId) != null) { evt.entry().prepareMarshal(cctx); - GridCacheDeploymentManager depMgr = - ctx.cache().internalCache(cacheName).context().deploy(); + GridCacheDeploymentManager depMgr = cctx.deploy(); depMgr.prepare(evt.entry()); } @@ -320,7 +316,7 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler { assert routineId != null; assert ctx != null; - GridCacheAdapter<K, V> cache = ctx.cache().<K, V>internalCache(cacheName); + GridCacheAdapter<K, V> cache = ctx.cache().internalCache(cacheName); if (cache != null) cache.context().continuousQueries().unregisterListener(internal, routineId);
