HBASE-13383 TestRegionServerObserver.testCoprocessorHooksInRegionsMer…

…ge zombie after HBASE-12975
apache · Apr 2, 2015 · 2688e83 · 2688e83
1 parent a609e5e
commit 2688e83
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java b/...server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java
@@ -121,14 +121,14 @@ public long getTimeStamp() {
    * @param b region b to merge
    * @param forcible if false, we will only merge adjacent regions
    */
-  public RegionMergeTransactionImpl(final HRegion a, final HRegion b,
+  public RegionMergeTransactionImpl(final Region a, final Region b,
       final boolean forcible) {
     if (a.getRegionInfo().compareTo(b.getRegionInfo()) <= 0) {
-      this.region_a = a;
-      this.region_b = b;
+      this.region_a = (HRegion)a;
+      this.region_b = (HRegion)b;
     } else {
-      this.region_a = b;
-      this.region_b = a;
+      this.region_a = (HRegion)b;
+      this.region_b = (HRegion)a;
     }
     this.forcible = forcible;
     this.mergesdir = region_a.getRegionFileSystem().getMergesDir();