Index: src/main/java/org/apache/hadoop/hbase/replication/ReplicationZookeeper.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/replication/ReplicationZookeeper.java (revision 1141288) +++ src/main/java/org/apache/hadoop/hbase/replication/ReplicationZookeeper.java (working copy) @@ -220,16 +220,16 @@ /** * Get the list of all the region servers from the specified peer * @param zkw zk connection to use - * @return list of region server addresses + * @return list of region server addresses or an empty list if the slave + * is unavailable */ private List fetchSlavesAddresses(ZooKeeperWatcher zkw) { - List rss = null; try { - rss = ZKUtil.listChildrenAndGetAsAddresses(zkw, zkw.rsZNode); + return ZKUtil.listChildrenAndGetAsAddresses(zkw, zkw.rsZNode); } catch (KeeperException e) { LOG.warn("Cannot get peer's region server addresses", e); + return new ArrayList(0); } - return rss; } /**