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 dadd719ab11d..1e336e543f26 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 @@ else if (!isLocalAffinity(descCfg))
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()));
With regards,
Apache Git Services