You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2017/10/13 17:43:27 UTC

[42/50] [abbrv] ignite git commit: Fixed NPE in case of null value for indexing.

Fixed NPE in case of null value for indexing.

(cherry picked from commit 6cf3b13)

(cherry picked from commit dd9804b)


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

Branch: refs/heads/ignite-2.1.5-p1
Commit: 25e4706501c1c0908df6d4cd070f84490c1ef6c4
Parents: 2310417
Author: mcherkasov <mc...@gridgain.com>
Authored: Thu Aug 31 12:11:01 2017 +0300
Committer: Dmitriy Govorukhin <dm...@gmail.com>
Committed: Fri Sep 22 15:29:38 2017 +0300

----------------------------------------------------------------------
 .../internal/processors/query/h2/database/InlineIndexHelper.java  | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/25e47065/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelper.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelper.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelper.java
index 1789ac8..aa53a35 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelper.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelper.java
@@ -383,6 +383,9 @@ public class InlineIndexHelper {
         if (type == Value.NULL)
             return Integer.MIN_VALUE;
 
+        if (v == ValueNull.INSTANCE)
+            return fixSort(1, sortType());
+
         if (this.type != type)
             throw new UnsupportedOperationException("Invalid fast index type: " + type);