Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-4753 org.apache.hadoop.hbase.regionserver.TestHRegionInfo#testGetSetOfHTD throws NPE on trunk 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1198581 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2011-11-06 22:47:17 +00:00
parent 7d8d42d01b
commit 02f6104dc2
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -455,6 +455,8 @@ Release 0.92.0 - Unreleased
HBASE-4745 LRU statistics thread should be a daemon HBASE-4745 LRU statistics thread should be a daemon
HBASE-4749 TestMasterFailover#testMasterFailoverWithMockedRITOnDeadRS HBASE-4749 TestMasterFailover#testMasterFailoverWithMockedRITOnDeadRS
occasionally fails occasionally fails
HBASE-4753 org.apache.hadoop.hbase.regionserver.TestHRegionInfo#testGetSetOfHTD
throws NPE on trunk (nkeywal)
TESTS TESTS
HBASE-4450 test for number of blocks read: to serve as baseline for expected HBASE-4450 test for number of blocks read: to serve as baseline for expected

4
src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java
View File

@ -430,7 +430,9 @@ public class FSTableDescriptors implements TableDescriptors {
FileSystem fs = FSUtils.getCurrentFileSystem(conf); FileSystem fs = FSUtils.getCurrentFileSystem(conf);
FileStatus status = getTableInfoPath(fs, FSUtils.getRootDir(conf), tableName); FileStatus status = getTableInfoPath(fs, FSUtils.getRootDir(conf), tableName);
// The below deleteDirectory works for either file or directory. // 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());
}
} }
/** /**