#IGNITE-51 - Fixed ENT node startup.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fbeb9e05 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fbeb9e05 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fbeb9e05 Branch: refs/heads/ignite-204 Commit: fbeb9e058aa2b4bed8d821d3a62c576f395cfaab Parents: 0e55e6c Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Tue Feb 10 23:28:44 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Tue Feb 10 23:28:44 2015 -0800 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheContext.java | 4 ++-- .../ignite/internal/processors/cache/GridCacheProcessor.java | 5 ++--- .../apache/ignite/loadtests/hashmap/GridCacheTestContext.java | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fbeb9e05/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 8fe80e3..5809401 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 @@ -232,6 +232,7 @@ public class GridCacheContext<K, V> implements Externalizable { GridCacheEventManager<K, V> evtMgr, GridCacheSwapManager<K, V> swapMgr, + IgniteCacheSerializationManager<K, V> serMgr, GridCacheStoreManager<K, V> storeMgr, GridCacheEvictionManager<K, V> evictMgr, GridCacheQueryManager<K, V> qryMgr, @@ -240,7 +241,6 @@ public class GridCacheContext<K, V> implements Externalizable { CacheDataStructuresManager<K, V> dataStructuresMgr, GridCacheTtlManager<K, V> ttlMgr, GridCacheDrManager<K, V> drMgr, - IgniteCacheSerializationManager<K, V> serMgr, CacheJtaManagerAdapter<K, V> jtaMgr) { assert ctx != null; assert sharedCtx != null; @@ -266,6 +266,7 @@ public class GridCacheContext<K, V> implements Externalizable { */ this.evtMgr = add(evtMgr); this.swapMgr = add(swapMgr); + this.serMgr = add(serMgr); this.storeMgr = add(storeMgr); this.evictMgr = add(evictMgr); this.qryMgr = add(qryMgr); @@ -274,7 +275,6 @@ public class GridCacheContext<K, V> implements Externalizable { this.dataStructuresMgr = add(dataStructuresMgr); this.ttlMgr = add(ttlMgr); this.drMgr = add(drMgr); - this.serMgr = add(serMgr); this.jtaMgr = add(jtaMgr); log = ctx.log(getClass()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fbeb9e05/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 53427d5..1c2499d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -646,6 +646,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { */ evtMgr, swapMgr, + serMgr, storeMgr, evictMgr, qryMgr, @@ -654,7 +655,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { dataStructuresMgr, ttlMgr, drMgr, - serMgr, jta); GridCacheAdapter cache = null; @@ -772,7 +772,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { evictMgr = new GridCacheEvictionManager(); evtMgr = new GridCacheEventManager(); drMgr = ctx.createComponent(GridCacheDrManager.class); - serMgr = ctx.createComponent(IgniteCacheSerializationManager.class); cacheCtx = new GridCacheContext( ctx, @@ -785,6 +784,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { */ evtMgr, swapMgr, + serMgr, storeMgr, evictMgr, qryMgr, @@ -793,7 +793,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { dataStructuresMgr, ttlMgr, drMgr, - serMgr, jta); GridDhtCacheAdapter dht = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fbeb9e05/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 b99a901..884ceca 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 @@ -57,6 +57,7 @@ public class GridCacheTestContext<K, V> extends GridCacheContext<K, V> { defaultCacheConfiguration(), new GridCacheEventManager<K, V>(), new GridCacheSwapManager<K, V>(false), + new IgniteCacheOsSerializationManager<K, V>(), new GridCacheStoreManager<K, V>(null, new IdentityHashMap<CacheStore, ThreadLocal>(), null, @@ -68,7 +69,6 @@ public class GridCacheTestContext<K, V> extends GridCacheContext<K, V> { new CacheDataStructuresManager<K, V>(), new GridCacheTtlManager<K, V>(), new GridOsCacheDrManager<K, V>(), - new IgniteCacheOsSerializationManager<K, V>(), new CacheNoopJtaManager<K, V>()); } }
