svn commit: r1220991 - in /hbase/trunk/src: main/java/org/apache/hadoop/hbase/regionserver/wal/SequenceFileLogWriter.java test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java

[stack]

Author: stack
Date: Mon Dec 19 23:04:15 2011
New Revision: 1220991

URL: http://svn.apache.org/viewvc?rev=1220991&view=rev
Log:
HBASE-5029 TestDistributedLogSplitting fails on occasion; Added catch of NPE 
and reenabled ignored test

Modified:
    
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/SequenceFileLogWriter.java
    
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/SequenceFileLogWriter.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/SequenceFileLogWriter.java?rev=1220991&r1=1220990&r2=1220991&view=diff
==============================================================================
--- 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/SequenceFileLogWriter.java
 (original)
+++ 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/SequenceFileLogWriter.java
 Mon Dec 19 23:04:15 2011
@@ -211,7 +211,12 @@ public class SequenceFileLogWriter imple
   @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;
     }
   }

Modified: 
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java?rev=1220991&r1=1220990&r2=1220991&view=diff
==============================================================================
--- 
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
 (original)
+++ 
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
 Mon Dec 19 23:04:15 2011
@@ -254,7 +254,6 @@ public class TestDistributedLogSplitting
    * detects that the region server has aborted.
    * @throws Exception
    */
-  @Ignore
   @Test (timeout=300000)
   public void testWorkerAbort() throws Exception {
     LOG.info("testWorkerAbort");