diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java index eae041b..fbe590f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java @@ -144,7 +144,9 @@ public class LocalHBaseCluster { // clash over default ports. conf.set(HConstants.MASTER_PORT, "0"); conf.set(HConstants.REGIONSERVER_PORT, "0"); - conf.set(HConstants.REGIONSERVER_INFO_PORT, "0"); + if (conf.getInt(HConstants.REGIONSERVER_INFO_PORT, 0) != -1) { + conf.set(HConstants.REGIONSERVER_INFO_PORT, "0"); + } this.masterClass = (Class) conf.getClass(HConstants.MASTER_IMPL, masterClass); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java index a200cdb..174c9c3 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java @@ -167,10 +167,10 @@ public class RegionStates { } /** - * @return an unmodifiable the region assignment map + * @return a copy of the region assignment map */ public synchronized Map getRegionAssignments() { - return Collections.unmodifiableMap(regionAssignments); + return new TreeMap(regionAssignments); } /**