HDFS-3992. Method org.apache.hadoop.hdfs.TestHftpFileSystem.tearDown() sometimes throws NPEs. Contributed by Ivan A. Veselovsky.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391764 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Aaron Myers 2012-09-29 07:31:48 +00:00
parent 288e052acd
commit f15b6b9959
2 changed files with 12 additions and 3 deletions

View File

@ -50,6 +50,9 @@ Release 2.0.3-alpha - Unreleased
HDFS-3964. Make NN log of fs.defaultFS debug rather than info. (eli) HDFS-3964. Make NN log of fs.defaultFS debug rather than info. (eli)
HDFS-3992. Method org.apache.hadoop.hdfs.TestHftpFileSystem.tearDown()
sometimes throws NPEs. (Ivan A. Veselovsky via atm)
Release 2.0.2-alpha - 2012-09-07 Release 2.0.2-alpha - 2012-09-07
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -102,9 +102,15 @@ public class TestHftpFileSystem {
@AfterClass @AfterClass
public static void tearDown() throws IOException { public static void tearDown() throws IOException {
hdfs.close(); if (hdfs != null) {
hftpFs.close(); hdfs.close();
cluster.shutdown(); }
if (hftpFs != null) {
hftpFs.close();
}
if (cluster != null) {
cluster.shutdown();
}
} }
/** /**