Repository: ignite Updated Branches: refs/heads/ignite-1232-1 [created] af53b8752
ignite-1232 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/af53b875 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/af53b875 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/af53b875 Branch: refs/heads/ignite-1232-1 Commit: af53b875206a0a86daef57bd0ac5236146b5f0f1 Parents: 129086a Author: sboikov <[email protected]> Authored: Fri Jul 22 13:38:50 2016 +0300 Committer: sboikov <[email protected]> Committed: Fri Jul 22 13:38:50 2016 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/query/GridQueryProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/af53b875/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index 9b62a45..04c6cb0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java @@ -279,7 +279,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { if (valCls != null) altTypeId = new TypeId(ccfg.getName(), valCls); - if (!cctx.customAffinityMapper()) { + if (!cctx.customAffinityMapper() && qryEntity.getKeyType() != null) { // Need to setup affinity key for distributed joins. String affField = ctx.cacheObjects().affinityField(qryEntity.getKeyType());
