Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java (revision 1441155) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java (working copy) @@ -827,6 +827,7 @@ } if (this.writer != null) { this.writer.close(); + this.writer = null; } } } @@ -1093,8 +1094,8 @@ synchronized (this.updateLock) { // HBASE-4387, HBASE-5623, retry with updateLock held tempWriter = this.writer; - logSyncerThread.hlogFlush(tempWriter, pending); } + if (tempWriter != null) logSyncerThread.hlogFlush(tempWriter, pending); } } // another thread might have sync'ed avoid double-sync'ing