From 2688e831e5ece1961752aed10240e4ab2506fda5 Mon Sep 17 00:00:00 2001 From: Andrew Purtell Date: Wed, 1 Apr 2015 21:46:08 -0700 Subject: [PATCH] HBASE-13383 TestRegionServerObserver.testCoprocessorHooksInRegionsMerge zombie after HBASE-12975 --- .../hbase/regionserver/RegionMergeTransactionImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java index bf695343958..cd0542512ab 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java @@ -121,14 +121,14 @@ public class RegionMergeTransactionImpl implements RegionMergeTransaction { * @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();