[ignite] branch master updated: IGNITE-10881 Normalize QueryEntities refactoring. - Fixes #5794.

[ag...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

agoncharuk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new b05a87f  IGNITE-10881 Normalize QueryEntities refactoring. - Fixes #5794.
b05a87f is described below

commit b05a87f09c3ede1a77a50cc174709ec3ca6483a0
Author: Evgeny Stanilovskiy <es...@gridgain.com>
AuthorDate: Mon Jan 14 12:06:49 2019 +0300

    IGNITE-10881 Normalize QueryEntities refactoring. - Fixes #5794.
    
    Signed-off-by: Alexey Goncharuk <al...@gmail.com>
---
 .../apache/ignite/internal/processors/cache/GridCacheProcessor.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 dadd719..1e336e5 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
@@ -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()));