Repository: incubator-ignite Updated Branches: refs/heads/ignite-45 c83d5a160 -> b9203abc6
# IGNITE-459 Bug fix: CacheContinuousQueryHandler does not support dynamically created caches. (cherry picked from commit 934304a) Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b9203abc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b9203abc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b9203abc Branch: refs/heads/ignite-45 Commit: b9203abc60b3834ba85253310c76fedb286b1493 Parents: c83d5a1 Author: sevdokimov <[email protected]> Authored: Thu Mar 12 14:30:20 2015 +0300 Committer: sevdokimov <[email protected]> Committed: Thu Mar 12 15:59:30 2015 +0300 ---------------------------------------------------------------------- .../cache/query/continuous/CacheContinuousQueryHandler.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b9203abc/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 0e2e63c..cec8820 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 @@ -281,7 +281,10 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler { assert routineId != null; assert ctx != null; - manager(ctx).unregisterListener(internal, routineId); + GridCacheAdapter<K, V> cache = ctx.cache().<K, V>internalCache(cacheName); + + if (cache != null) + cache.context().continuousQueries().unregisterListener(internal, routineId); } /**
