Repository: incubator-ignite Updated Branches: refs/heads/ignite-143 d0c88b79f -> 155ebc0f6
# IGNITE-143 - Fixing tests Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/155ebc0f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/155ebc0f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/155ebc0f Branch: refs/heads/ignite-143 Commit: 155ebc0f60c2f2d3c258d5b043ccfa2bfdbe532f Parents: d0c88b7 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Thu Feb 12 17:34:58 2015 -0800 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Thu Feb 12 17:34:58 2015 -0800 ---------------------------------------------------------------------- .../datastructures/CacheDataStructuresManager.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/155ebc0f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java index 11c85ca..407da34 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java @@ -57,9 +57,6 @@ public class CacheDataStructuresManager<K, V> extends GridCacheManagerAdapter<K, /** Queue header view. */ private CacheProjection<GridCacheQueueHeaderKey, GridCacheQueueHeader> queueHdrView; - /** System cache. */ - private GridCacheAdapter<Object, Object> sysCache; - /** Query notifying about queue update. */ private UUID queueQryId; @@ -89,8 +86,6 @@ public class CacheDataStructuresManager<K, V> extends GridCacheManagerAdapter<K, try { queueHdrView = cctx.cache().projection(GridCacheQueueHeaderKey.class, GridCacheQueueHeader.class); - sysCache = cctx.kernalContext().cache().utilityCache(); - initFlag = true; } finally { @@ -186,9 +181,9 @@ public class CacheDataStructuresManager<K, V> extends GridCacheManagerAdapter<K, return null; if (queueQryGuard.compareAndSet(false, true)) { - queueQryId = sysCache.context().continuousQueries().executeInternalQuery( - new CacheEntryUpdatedListener<Object, Object>() { - @Override public void onUpdated(Iterable<CacheEntryEvent<?, ?>> evts) { + queueQryId = cctx.continuousQueries().executeInternalQuery( + new CacheEntryUpdatedListener<K, V>() { + @Override public void onUpdated(Iterable<CacheEntryEvent<? extends K, ? extends V>> evts) { if (!busyLock.enterBusy()) return; @@ -533,7 +528,8 @@ public class CacheDataStructuresManager<K, V> extends GridCacheManagerAdapter<K, /** * Predicate for queue continuous query. */ - private static class QueueHeaderPredicate implements CacheEntryEventFilter<Object, Object>, Externalizable { + private static class QueueHeaderPredicate<K, V> implements CacheEntryEventFilter<K, V>, + Externalizable { /** */ private static final long serialVersionUID = 0L; @@ -545,7 +541,7 @@ public class CacheDataStructuresManager<K, V> extends GridCacheManagerAdapter<K, } /** {@inheritDoc} */ - @Override public boolean evaluate(CacheEntryEvent<?, ?> e) { + @Override public boolean evaluate(CacheEntryEvent<? extends K, ? extends V> e) { return e.getKey() instanceof GridCacheQueueHeaderKey; }
