You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by bi...@apache.org on 2017/09/18 05:44:11 UTC
[18/29] kylin git commit: KYLIN-2871, fix ineffective null check
KYLIN-2871, fix ineffective null check
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/fd4a178c
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/fd4a178c
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/fd4a178c
Branch: refs/heads/security_update
Commit: fd4a178cdf5f7c81463938f6909fafb41f54fe9c
Parents: b97e16a
Author: liveandevil <13...@qq.com>
Authored: Sat Sep 16 19:30:22 2017 +0800
Committer: Dong Li <li...@apache.org>
Committed: Sat Sep 16 20:42:31 2017 +0800
----------------------------------------------------------------------
.../main/java/org/apache/kylin/metadata/model/SegmentRange.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/fd4a178c/core-metadata/src/main/java/org/apache/kylin/metadata/model/SegmentRange.java
----------------------------------------------------------------------
diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/SegmentRange.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/SegmentRange.java
index e52da09..23afb87 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/SegmentRange.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/SegmentRange.java
@@ -147,6 +147,8 @@ public class SegmentRange<T extends Comparable> implements Serializable {
return new Comparator<Endpoint>() {
@Override
public int compare(Endpoint a, Endpoint b) {
+ if (a == null || b == null)
+ throw new IllegalStateException();
if (a.isMin) {
return b.isMin ? 0 : -1;
} else if (b.isMin) {
@@ -156,9 +158,6 @@ public class SegmentRange<T extends Comparable> implements Serializable {
} else if (b.isMax) {
return a.isMax ? 0 : -1;
} else {
- if (a == null || b == null)
- throw new IllegalStateException();
-
return valueComparator.compare(a.v, b.v);
}
}