IGNITE-10881 Normalize QueryEntities refactoring. - Fixes #5794.
authorEvgeny Stanilovskiy <estanilovskiy@gridgain.com>
Mon, 14 Jan 2019 09:06:49 +0000 (12:06 +0300)
committerAlexey Goncharuk <alexey.goncharuk@gmail.com>
Mon, 14 Jan 2019 09:06:49 +0000 (12:06 +0300)
Signed-off-by: Alexey Goncharuk <alexey.goncharuk@gmail.com>
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java

index dadd719..1e336e5 100644 (file)
@@ -5417,8 +5417,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
 
                 initialize(cfg, cacheObjCtx);
 
-                if (cachesInfo.restartingCaches().contains(req.cacheName()))
-                    req.schema(new QuerySchema(qryEntities == null? cfg.getQueryEntities() : qryEntities));
+                if (restartId != null)
+                    req.schema(new QuerySchema(qryEntities == null ? cfg.getQueryEntities() : qryEntities));
                 else
                     req.schema(new QuerySchema(qryEntities != null ? QueryUtils.normalizeQueryEntities(qryEntities, cfg)
                             : cfg.getQueryEntities()));