fix NPE

kakao · Mar 27, 2019 · 5b28fc6 · 5b28fc6
1 parent aed580d
commit 5b28fc6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/hbase0.98/hbase-common-0.98/src/main/java/com/kakao/hbase/common/LoadEntry.java b/hbase0.98/hbase-common-0.98/src/main/java/com/kakao/hbase/common/LoadEntry.java
@@ -400,7 +400,7 @@ private static Number diffRatioNumber(Number one, Number two) {
         if (one == null) {
             if (two == null) return null;
             else {
-                if (two.intValue() == 0) {
+                if (two == 0) {
                     return RatioNumber.ZERO.doubleValue();
                 } else {
                     return -two.doubleValue();
@@ -409,7 +409,7 @@ private static Number diffRatioNumber(Number one, Number two) {
         } else {
             if (two == null) return one.doubleValue();
             else {
-                if (two.intValue() == 0) {
+                if (two == 0) {
                     return one.doubleValue();
                 } else {
                     return one.doubleValue() - two.doubleValue();
@@ -432,7 +432,7 @@ private static Number addRatioNumber(Number one, Number two) {
         if (one == null) {
             if (two == null) return null;
             else {
-                if (two.intValue() == 0) {
+                if (two == 0) {
                     return RatioNumber.ZERO;
                 } else {
                     return two;
@@ -441,9 +441,9 @@ private static Number addRatioNumber(Number one, Number two) {
         } else {
             if (two == null) return one;
             else {
-                if (one.intValue() == 0) {
+                if (one == 0) {
                     return two;
-                } else if (two.intValue() == 0) {
+                } else if (two == 0) {
                     return one;
                 } else {
                     return ((RatioNumber) one).add((RatioNumber) two);
@@ -563,4 +563,4 @@ public String toString(Number value) {
     public abstract int compare(Number one, Number two);
 
     public abstract Number toNumber(String string);
-}
+}
diff --git a/hbase0.98/hbase-table-stat-0.98/src/main/java/com/kakao/hbase/stat/load/Load.java b/hbase0.98/hbase-table-stat-0.98/src/main/java/com/kakao/hbase/stat/load/Load.java
@@ -145,7 +145,7 @@ public boolean isRecordChanged(Level level) {
     }
 
     public boolean isSummaryChanged(LoadEntry loadEntry) {
-        return summaryChangeMap.get(loadEntry).intValue() == ChangeState.changed.ordinal();
+        return summaryChangeMap.get(loadEntry) == ChangeState.changed.ordinal();
     }
 
     public boolean isDiffFromStart() {

diff --git a/hbase0.98/hbase-table-stat-0.98/src/main/java/com/kakao/hbase/stat/load/LoadIO.java b/hbase0.98/hbase-table-stat-0.98/src/main/java/com/kakao/hbase/stat/load/LoadIO.java
@@ -29,10 +29,7 @@
 import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.*;
 
 public class LoadIO {
     public static final String NO_SAVED_FILE = "There is no saved file.";
@@ -242,6 +239,7 @@ private String parseTimestamp(Args args, String fileName) {
     List<String> savedFileNameList(Args args) {
         List<String> fileNameList = new ArrayList<>();
         listFiles(fileNameList, args);
+        Collections.sort(fileNameList);
         return fileNameList;
     }