IGNITE-1026 - Data structures fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1419d39b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1419d39b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1419d39b Branch: refs/heads/ignite-648 Commit: 1419d39ba80da9f85b28c708589f74dcec6514d5 Parents: 2f089f1 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Thu Jun 18 16:54:51 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Thu Jun 18 16:54:51 2015 -0700 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheProcessor.java | 2 +- .../processors/datastructures/DataStructuresProcessor.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1419d39b/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 ac2d7b1..4f1a3e6 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 @@ -2535,7 +2535,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { IgniteCacheProxy<?, ?> cache = jCacheProxies.get(masked); if (cache == null) { - dynamicStartCache(null, name, null, false, false); + dynamicStartCache(null, name, null, false, true).get(); cache = jCacheProxies.get(masked); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1419d39b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java index dcd22cd..26e2f6c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java @@ -177,7 +177,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { if (initLatch.getCount() > 0) { initFailed = true; - + initLatch.countDown(); } @@ -890,7 +890,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { String cacheName = ((CollectionInfo)oldInfo.info).cacheName; - GridCacheContext cacheCtx = ctx.cache().internalCache(cacheName).context(); + GridCacheContext cacheCtx = ctx.cache().getOrStartCache(cacheName).context(); return c.applyx(cacheCtx); }
