# ignite-51
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4809eab5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4809eab5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4809eab5 Branch: refs/heads/ignite-410 Commit: 4809eab5b39be91a02435220753be3d9177ae4ee Parents: caa0039 Author: sboikov <sboi...@gridgain.com> Authored: Wed Mar 11 11:49:23 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Mar 11 11:49:23 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheContext.java | 6 +++--- .../apache/ignite/loadtests/hashmap/GridCacheTestContext.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4809eab5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index 20ba4a0..1d30d81 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -117,7 +117,7 @@ public class GridCacheContext<K, V> implements Externalizable { private GridCacheSwapManager swapMgr; /** Evictions manager. */ - private GridCacheEvictionManager<K, V> evictMgr; + private GridCacheEvictionManager evictMgr; /** Data structures manager. */ private CacheDataStructuresManager dataStructuresMgr; @@ -228,7 +228,7 @@ public class GridCacheContext<K, V> implements Externalizable { GridCacheEventManager evtMgr, GridCacheSwapManager swapMgr, GridCacheStoreManager storeMgr, - GridCacheEvictionManager<K, V> evictMgr, + GridCacheEvictionManager evictMgr, GridCacheQueryManager<K, V> qryMgr, CacheContinuousQueryManager contQryMgr, GridCacheAffinityManager affMgr, @@ -910,7 +910,7 @@ public class GridCacheContext<K, V> implements Externalizable { /** * @return Eviction manager. */ - public GridCacheEvictionManager<K, V> evicts() { + public GridCacheEvictionManager evicts() { return evictMgr; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4809eab5/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java index 50a7c4c..459043e 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java @@ -61,7 +61,7 @@ public class GridCacheTestContext<K, V> extends GridCacheContext<K, V> { new IdentityHashMap<CacheStore, ThreadLocal>(), null, new CacheConfiguration()), - new GridCacheEvictionManager<K, V>(), + new GridCacheEvictionManager(), new GridCacheLocalQueryManager<K, V>(), new CacheContinuousQueryManager(), new GridCacheAffinityManager(),