# Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-80
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8ef3fbe8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8ef3fbe8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8ef3fbe8 Branch: refs/heads/ignite-80 Commit: 8ef3fbe85347c2e113c07e4aa40591200024026a Parents: 54eca28 Author: sboikov <sboi...@gridgain.com> Authored: Thu Apr 9 15:33:30 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Apr 9 15:33:30 2015 +0300 ---------------------------------------------------------------------- .../processors/datastructures/DataStructuresProcessor.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8ef3fbe8/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 21e11fd..8106be0 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 @@ -97,7 +97,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { private GridCacheProjectionEx<CacheDataStructuresConfigurationKey, Map<String, DataStructureInfo>> dsInfoView; /** */ - private GridCacheProjectionEx<CacheDataStructuresCacheKey, List<CacheCollectionInfo>> utilityDataCache; + private GridCacheProjectionEx<CacheDataStructuresCacheKey, List<CacheCollectionInfo>> dsCacheInfoView; /** * @param ctx Context. @@ -122,6 +122,8 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { dsInfoView = (GridCacheProjectionEx)atomicsCache; + dsCacheInfoView = (GridCacheProjectionEx)atomicsCache; + dsView = atomicsCache; cntDownLatchView = atomicsCache; @@ -674,12 +676,12 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { * @return Cache name. */ private String compatibleConfiguration(CollectionConfiguration cfg) throws IgniteCheckedException { - List<CacheCollectionInfo> caches = utilityDataCache.localPeek(DATA_STRUCTURES_CACHE_KEY, null, null); + List<CacheCollectionInfo> caches = dsCacheInfoView.localPeek(DATA_STRUCTURES_CACHE_KEY, null, null); String cacheName = findCompatibleConfiguration(cfg, caches); if (cacheName == null) - cacheName = utilityDataCache.invoke(DATA_STRUCTURES_CACHE_KEY, new AddDataCacheProcessor(cfg)).get(); + cacheName = dsCacheInfoView.invoke(DATA_STRUCTURES_CACHE_KEY, new AddDataCacheProcessor(cfg)).get(); assert cacheName != null;
