You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2011/11/06 23:47:18 UTC

svn commit: r1198581 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java

Author: stack
Date: Sun Nov  6 22:47:17 2011
New Revision: 1198581

URL: http://svn.apache.org/viewvc?rev=1198581&view=rev
Log:
HBASE-4753 org.apache.hadoop.hbase.regionserver.TestHRegionInfo#testGetSetOfHTD throws NPE on trunk

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1198581&r1=1198580&r2=1198581&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Sun Nov  6 22:47:17 2011
@@ -455,6 +455,8 @@ Release 0.92.0 - Unreleased
    HBASE-4745  LRU statistics thread should be a daemon
    HBASE-4749  TestMasterFailover#testMasterFailoverWithMockedRITOnDeadRS
                occasionally fails
+   HBASE-4753  org.apache.hadoop.hbase.regionserver.TestHRegionInfo#testGetSetOfHTD
+               throws NPE on trunk (nkeywal)
 
   TESTS
    HBASE-4450  test for number of blocks read: to serve as baseline for expected

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java?rev=1198581&r1=1198580&r2=1198581&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java Sun Nov  6 22:47:17 2011
@@ -430,7 +430,9 @@ public class FSTableDescriptors implemen
     FileSystem fs = FSUtils.getCurrentFileSystem(conf);
     FileStatus status = getTableInfoPath(fs, FSUtils.getRootDir(conf), tableName);
     // The below deleteDirectory works for either file or directory.
-    if (fs.exists(status.getPath())) FSUtils.deleteDirectory(fs, status.getPath());
+    if (status != null && fs.exists(status.getPath()))  {
+      FSUtils.deleteDirectory(fs, status.getPath());
+    }
   }
 
   /**