Repository: hbase
Updated Branches:
refs/heads/branch-1 1e0067304 -> ac7fd29f7
HBASE-19350 TestMetaWithReplicas is flaky
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ac7fd29f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ac7fd29f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ac7fd29f
Branch: refs/heads/branch-1
Commit: ac7fd29f7e38f8c83ac14e052c7a4d81dd748bcd
Parents: 1e00673
Author: Chia-Ping Tsai <chia7712@gmail.com>
Authored: Fri Dec 1 03:44:46 2017 +0800
Committer: Chia-Ping Tsai <chia7712@gmail.com>
Committed: Fri Dec 1 03:44:46 2017 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/ClusterStatus.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/ac7fd29f/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
index 2eb1162..e2f10d3 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
@@ -303,7 +303,10 @@ public class ClusterStatus extends VersionedWritable {
@InterfaceAudience.Private
public Set<RegionState> getRegionsInTransition() {
- return this.intransition;
+ if (intransition == null) {
+ return Collections.emptySet();
+ }
+ return Collections.unmodifiableSet(intransition);
}
public String getClusterId() {
|