Repository: hbase
Updated Branches:
refs/heads/0.98 38cd55945 -> a59658c6c
HBASE-13612 TestRegionFavoredNodes should guard against setup failure.
Conflicts:
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionFavoredNodes.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a59658c6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a59658c6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a59658c6
Branch: refs/heads/0.98
Commit: a59658c6cf5830566127cd6d9aa257d5aec15359
Parents: 38cd559
Author: Sean Busbey <[email protected]>
Authored: Sun May 3 01:44:08 2015 -0500
Committer: Sean Busbey <[email protected]>
Committed: Sat May 9 22:42:58 2015 -0500
----------------------------------------------------------------------
.../apache/hadoop/hbase/regionserver/TestRegionFavoredNodes.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/a59658c6/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionFavoredNodes.java
----------------------------------------------------------------------
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionFavoredNodes.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionFavoredNodes.java
index 46a4062..82a17bb 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionFavoredNodes.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionFavoredNodes.java
@@ -78,6 +78,10 @@ public class TestRegionFavoredNodes {
@AfterClass
public static void tearDownAfterClass() throws Exception {
+ // guard against failure in setup
+ if (table != null) {
+ table.close();
+ }
if (createWithFavoredNode == null) {
return;
}