Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (revision 1542221) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (working copy) @@ -1612,10 +1612,13 @@ if (this.replicationSourceHandler == this.replicationSinkHandler && this.replicationSourceHandler != null) { this.replicationSourceHandler.startReplicationService(); - } else if (this.replicationSourceHandler != null) { - this.replicationSourceHandler.startReplicationService(); - } else if (this.replicationSinkHandler != null) { - this.replicationSinkHandler.startReplicationService(); + } else { + if (this.replicationSourceHandler != null) { + this.replicationSourceHandler.startReplicationService(); + } + if (this.replicationSinkHandler != null) { + this.replicationSinkHandler.startReplicationService(); + } } // Start Server. This service is like leases in that it internally runs Index: hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java (revision 1542221) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java (working copy) @@ -220,7 +220,7 @@ * @param rows list of actions * @throws IOException */ - private void batch(TableName tableName, Collection> allRows) throws IOException { + protected void batch(TableName tableName, Collection> allRows) throws IOException { if (allRows.isEmpty()) { return; }