Index: src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java (revision 1220923) +++ src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java (working copy) @@ -254,7 +254,6 @@ * detects that the region server has aborted. * @throws Exception */ - @Ignore @Test (timeout=300000) public void testWorkerAbort() throws Exception { LOG.info("testWorkerAbort"); Index: src/main/java/org/apache/hadoop/hbase/regionserver/wal/SequenceFileLogWriter.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/regionserver/wal/SequenceFileLogWriter.java (revision 1220923) +++ src/main/java/org/apache/hadoop/hbase/regionserver/wal/SequenceFileLogWriter.java (working copy) @@ -211,7 +211,12 @@ @Override public void close() throws IOException { if (this.writer != null) { - this.writer.close(); + try { + this.writer.close(); + } catch (NullPointerException npe) { + // Can get a NPE coming up from down in DFSClient$DFSOutputStream#close + LOG.warn(npe); + } this.writer = null; } }