Index: src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java (revision 1353679) +++ src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java (working copy) @@ -705,7 +705,10 @@ + " because an error occurred: " + reason, cause); } this.running = false; - Threads.shutdown(this, this.sleepForRetries); + // Only wait for the thread to die if it's not us + if (!Thread.currentThread().equals(this)) { + Threads.shutdown(this, this.sleepForRetries); + } } /**