ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [1/2] incubator-ignite git commit: ignite-gg-9933 - value type can be a class
Date Sat, 21 Mar 2015 03:04:31 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-offheap-hang [created] d7eb3f8d4


ignite-gg-9933 - value type can be a class


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e444ffc2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e444ffc2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e444ffc2

Branch: refs/heads/ignite-offheap-hang
Commit: e444ffc2c0a55f0b0d067ed36dd09799c4a04783
Parents: 62f93c2
Author: S.Vladykin <svladykin@gridgain.com>
Authored: Sat Mar 21 04:55:43 2015 +0300
Committer: S.Vladykin <svladykin@gridgain.com>
Committed: Sat Mar 21 04:55:43 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/query/GridQueryProcessor.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e444ffc2/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 63fe7ac..6bd47a4 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
@@ -1064,9 +1064,11 @@ public class GridQueryProcessor extends GridProcessorAdapter {
         if (F.isEmpty(meta.getValueType()))
             throw new IgniteCheckedException("Value type is not set: " + meta);
 
-        d.name(meta.getValueType());
+        Class<?> valCls = U.classForName(meta.getValueType(), null);
 
-        d.valueClass(U.classForName(meta.getValueType(), Object.class));
+        d.name(valCls != null ? typeName(valCls) : meta.getValueType());
+
+        d.valueClass(valCls != null ? valCls : Object.class);
         d.keyClass(meta.getKeyType() == null ? Object.class : U.classForName(meta.getKeyType(),
Object.class));
 
         return d;


Mime
View raw message