GG-12210 Don't allow join server node and smart merge client configuration during snapshot restore -fixing NPE
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cde190d5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cde190d5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cde190d5 Branch: refs/heads/ignite-5398 Commit: cde190d520cd170b7fe936fc4a25a7908fe5f1fc Parents: 7b06de3 Author: EdShangGG <[email protected]> Authored: Wed May 24 15:56:06 2017 +0300 Committer: EdShangGG <[email protected]> Committed: Wed May 24 15:56:06 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheProcessor.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cde190d5/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 487500a..dfa37f1 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 @@ -1905,7 +1905,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { if (req.restart()) { proxy = jCacheProxies.get(maskNull(req.cacheName())); - restartingCaches.add(req.cacheName()); + restartingCaches.add(maskNull(req.cacheName())); if (proxy != null) proxy.restart(); @@ -2267,7 +2267,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { else { assert req.cacheType() != null : req; - if (restartingCaches.contains(req.cacheName())) + if (restartingCaches.contains(maskNull(req.cacheName()))) continue; DynamicCacheDescriptor desc = new DynamicCacheDescriptor( @@ -2299,8 +2299,8 @@ public class GridCacheProcessor extends GridProcessorAdapter { } } - for (String s : batch.restartingCaches()) - registeredCaches.remove(s); + for (String name : batch.restartingCaches()) + registeredCaches.remove(name); restartingCaches.addAll(batch.restartingCaches()); @@ -2308,7 +2308,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { for (Map.Entry<String, Map<UUID, Boolean>> entry : batch.clientNodes().entrySet()) { String cacheName = entry.getKey(); - if (!restartingCaches.contains(cacheName)) + if (!restartingCaches.contains(maskNull(cacheName))) for (Map.Entry<UUID, Boolean> tup : entry.getValue().entrySet()) ctx.discovery().addClientNode(cacheName, tup.getKey(), tup.getValue()); }
