IGNITE-2100: Bugfix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/90e3c2fa Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/90e3c2fa Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/90e3c2fa Branch: refs/heads/ignite-2100 Commit: 90e3c2fa80c2bffe9b46f3e8d2ee3a39e78deec6 Parents: c21ac4e Author: vozerov-gridgain <[email protected]> Authored: Thu Dec 17 11:50:26 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Thu Dec 17 11:50:26 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/query/GridQueryProcessor.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/90e3c2fa/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 9d01302..28b854c 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 @@ -212,7 +212,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { // Key and value classes still can be available if they are primitive or JDK part. // We need that to set correct types for _key and _val columns. - Class<?> keyCls = U.classForName(qryEntity.getKeyType(), Object.class); + Class<?> keyCls = U.classForName(qryEntity.getKeyType(), null); Class<?> valCls = U.classForName(qryEntity.getValueType(), null); // If local node has the classes and they are externalizable, we must use reflection properties. @@ -221,6 +221,9 @@ public class GridQueryProcessor extends GridProcessorAdapter { boolean keyOrValMustDeserialize = keyMustDeserialize || valMustDeserialize; + if (keyCls == null) + keyCls = Object.class; + String simpleValType = valCls == null ? typeName(qryEntity.getValueType()) : typeName(valCls); desc.name(simpleValType); @@ -303,7 +306,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { // Key and value classes still can be available if they are primitive or JDK part. // We need that to set correct types for _key and _val columns. - Class<?> keyCls = U.classForName(meta.getKeyType(), Object.class); + Class<?> keyCls = U.classForName(meta.getKeyType(), null); Class<?> valCls = U.classForName(meta.getValueType(), null); // If local node has the classes and they are externalizable, we must use reflection properties. @@ -312,6 +315,9 @@ public class GridQueryProcessor extends GridProcessorAdapter { boolean keyOrValMustDeserialize = keyMustDeserialize || valMustDeserialize; + if (keyCls == null) + keyCls = Object.class; + desc.name(meta.getSimpleValueType()); if (binaryEnabled && !keyOrValMustDeserialize) {
