Index: src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java (revision 1171163) +++ src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java (working copy) @@ -9,6 +9,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.Stoppable; import org.apache.hadoop.hbase.replication.regionserver.ReplicationSourceManager; import org.junit.BeforeClass; import org.junit.Test; @@ -48,8 +49,13 @@ HConstants.HREGION_OLDLOGDIR_NAME); Path logDir = new Path(TEST_UTIL.getTestDir(), HConstants.HREGION_LOGDIR_NAME); - manager = new ReplicationSourceManager(admin.getReplicationZk(), - conf, null, FileSystem.get(conf), replicating, logDir, oldLogDir); + manager = new ReplicationSourceManager(admin.getReplicationZk(), conf, + new Stoppable() { + @Override + public void stop(String why) {} + @Override + public boolean isStopped() {return false;} + }, FileSystem.get(conf), replicating, logDir, oldLogDir); } /** Index: src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java (revision 1171163) +++ src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java (working copy) @@ -427,7 +427,7 @@ * @param path full path of the node whose children have changed */ public void nodeChildrenChanged(String path) { - if (stopper == null || stopper.isStopped()) { + if (stopper.isStopped()) { return; } refreshRegionServersList(path);