[hbase] branch branch-2.2 updated: HBASE-22941 Addendum fix NPE in UT

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.2 by this push:
     new 987a08a  HBASE-22941 Addendum fix NPE in UT
987a08a is described below

commit 987a08a6f5aca799a76ba9494e9c4bafc5526f31
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Fri Sep 20 14:35:56 2019 +0800

    HBASE-22941 Addendum fix NPE in UT
---
 .../src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java
index 0aa3297..04389bb 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java
@@ -109,7 +109,6 @@ public class TestSplitMerge {
 
   @Test
   public void testMergeRegionOrder() throws Exception {
-
     int regionCount= 20;
 
     TableName tableName = TableName.valueOf("MergeRegionOrder");
@@ -143,14 +142,13 @@ public class TestSplitMerge {
     RegionInfo mergedRegion = mergedRegions.get(0);
 
     List<RegionInfo> mergeParentRegions = MetaTableAccessor.getMergeRegions(UTIL.getConnection(),
-      mergedRegion.getEncodedNameAsBytes());
+      mergedRegion.getRegionName());
 
     assertEquals(mergeParentRegions.size(), regionCount);
 
-    for (int c = 0; c < regionCount-1; c++) {
-      assertTrue(Bytes.compareTo(
-        mergeParentRegions.get(c).getStartKey(),
-        mergeParentRegions.get(c+1).getStartKey()) < 0);
+    for (int c = 0; c < regionCount - 1; c++) {
+      assertTrue(Bytes.compareTo(mergeParentRegions.get(c).getStartKey(),
+        mergeParentRegions.get(c + 1).getStartKey()) < 0);
     }
   }
 }