Repository: ignite Updated Branches: refs/heads/ignite-7708 d08d0073d -> 7bde53f30
IGNITE-8280 Fix of NPE on some cases at the QueryEntity.getDecimalInfo - Fixes #3831. Signed-off-by: dpavlov <dpav...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9557f6dc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9557f6dc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9557f6dc Branch: refs/heads/ignite-7708 Commit: 9557f6dcbbe5d86d892ffaca5a9bb66cc5401e84 Parents: 7586cfd Author: tledkov-gridgain <tled...@gridgain.com> Authored: Mon Apr 16 18:45:11 2018 +0300 Committer: dpavlov <dpav...@apache.org> Committed: Mon Apr 16 18:45:11 2018 +0300 ---------------------------------------------------------------------- .../core/src/main/java/org/apache/ignite/cache/QueryEntity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9557f6dc/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java b/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java index aff3461..976bd67 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java @@ -405,7 +405,7 @@ public class QueryEntity implements Serializable { * @return Set of names of fields that must have non-null values. */ public Map<String, IgniteBiTuple<Integer, Integer>> getDecimalInfo() { - return unmodifiableMap(decimalInfo); + return decimalInfo == null ? Collections.emptyMap() : unmodifiableMap(decimalInfo); } /**