HBASE-9450 TestDistributedLogSplitting fails

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1520613 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
jxiang 2013-09-06 15:50:48 +00:00
parent df49eca1eb
commit 1f47ffb7fa

View File

@ -2023,11 +2023,15 @@ public class HBaseAdmin implements Abortable, Closeable {
return HRegionInfo.FIRST_META_REGIONINFO.getRegionName(); return HRegionInfo.FIRST_META_REGIONINFO.getRegionName();
} }
CatalogTracker ct = getCatalogTracker(); CatalogTracker ct = getCatalogTracker();
Pair<HRegionInfo, ServerName> regionServerPair
= getRegion(regionNameOrEncodedRegionName, ct);
byte[] tmp = regionNameOrEncodedRegionName; byte[] tmp = regionNameOrEncodedRegionName;
if (regionServerPair != null && regionServerPair.getFirst() != null) { try {
tmp = regionServerPair.getFirst().getRegionName(); Pair<HRegionInfo, ServerName> regionServerPair
= getRegion(regionNameOrEncodedRegionName, ct);
if (regionServerPair != null && regionServerPair.getFirst() != null) {
tmp = regionServerPair.getFirst().getRegionName();
}
} finally {
cleanupCatalogTracker(ct);
} }
return tmp; return tmp;
} }