HBASE-22941 Addendum fix NPE in UT

apache · Sep 20, 2019 · e890776 · e890776
1 parent 49718b8
commit e890776
Showing 1 changed file with 4 additions and 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
@@ -109,7 +109,6 @@ public String explainFailure() throws Exception {
 
   @Test
   public void testMergeRegionOrder() throws Exception {
-
     int regionCount= 20;
 
     TableName tableName = TableName.valueOf("MergeRegionOrder");
@@ -143,14 +142,13 @@ public void testMergeRegionOrder() throws Exception {
     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);
     }
   }
 }