diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/util/DynamicClassLoader.java hbase-common/src/main/java/org/apache/hadoop/hbase/util/DynamicClassLoader.java index 1a730696c4..a805fbfad2 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/util/DynamicClassLoader.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/util/DynamicClassLoader.java @@ -179,8 +179,9 @@ public class DynamicClassLoader extends ClassLoaderBase { private synchronized void loadNewJars() { // Refresh local jar file lists - if (localDir != null) { - for (File file : localDir.listFiles()) { + File[] files = localDir == null ? null : localDir.listFiles(); + if (files != null) { + for (File file : files) { String fileName = file.getName(); if (jarModifiedTime.containsKey(fileName)) { continue; diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/util/OrderedBytes.java hbase-common/src/main/java/org/apache/hadoop/hbase/util/OrderedBytes.java index 3e4bc6ca58..7ba17f99e8 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/util/OrderedBytes.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/util/OrderedBytes.java @@ -461,7 +461,7 @@ public class OrderedBytes { static int lengthVaruint64(PositionedByteRange src, boolean comp) { int a0 = (comp ? DESCENDING : ASCENDING).apply(src.peek()) & 0xff; if (a0 <= 240) return 1; - if (a0 >= 241 && a0 <= 248) return 2; + if (a0 <= 248) return 2; if (a0 == 249) return 3; if (a0 == 250) return 4; if (a0 == 251) return 5;