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

HDFS-8043. NPE in MiniDFSCluster teardown. Contributed by Brahma Reddy Battula.

This commit is contained in:
Tsuyoshi Ozawa 2015-04-19 18:19:36 +09:00
parent 5112477d9e
commit 5459b241c8
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -520,6 +520,8 @@ Release 2.8.0 - UNRELEASED
HDFS-7863. Missing description of some methods and parameters in javadoc of
FSDirDeleteOp. (Brahma Reddy Battula via ozawa)
HDFS-8043. NPE in MiniDFSCluster teardown. (Brahma Reddy Battula via ozawa)
Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES

7
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
View File

@ -1744,11 +1744,14 @@ public void shutdown(boolean deleteDfsDir, boolean closeFileSystem) {
nameNode = null;
}
}
if (deleteDfsDir) {
if (base_dir != null) {
if (deleteDfsDir) {
base_dir.delete();
} else {
} else {
base_dir.deleteOnExit();
}
}
}
/**

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientFailover.java
View File

@ -85,7 +85,9 @@ public void setUpCluster() throws IOException {
@After
public void tearDownCluster() throws IOException {
cluster.shutdown();
if (cluster != null) {
cluster.shutdown();
}
}
@After