Repository: ignite Updated Branches: refs/heads/ignite-1534-1 e250c7f5c -> a586686c4
ignite-1534 Fixed races in dynamic cache start Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a586686c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a586686c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a586686c Branch: refs/heads/ignite-1534-1 Commit: a586686c447d3f569d1cfad33f42226fefe159bd Parents: e250c7f Author: sboikov <[email protected]> Authored: Thu Oct 1 13:08:23 2015 +0300 Committer: sboikov <[email protected]> Committed: Thu Oct 1 13:08:23 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a586686c/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 2dad84e..daa4475 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 @@ -1958,12 +1958,12 @@ public class GridCacheProcessor extends GridProcessorAdapter { if (req.initiatingNodeId() == null) desc.staticallyConfigured(true); + desc.receivedOnDiscovery(true); + DynamicCacheDescriptor old = registeredCaches.put(maskNull(req.cacheName()), desc); assert old == null : old; - desc.receivedOnDiscovery(true); - ctx.discovery().setCacheFilter( req.cacheName(), ccfg.getNodeFilter(),
