You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/07/22 11:35:56 UTC
ignite git commit: ignite-1232 skip queryentity with null key type
(possible for .net)
Repository: ignite
Updated Branches:
refs/heads/ignite-1232 129086a2c -> 91c1c7381
ignite-1232 skip queryentity with null key type (possible for .net)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/91c1c738
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/91c1c738
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/91c1c738
Branch: refs/heads/ignite-1232
Commit: 91c1c7381c6540d2d178bb33e6ea21d3b8581b42
Parents: 129086a
Author: sboikov <sb...@gridgain.com>
Authored: Fri Jul 22 14:35:55 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Jul 22 14:35:55 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/91c1c738/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());