Repository: hadoop Updated Branches: refs/heads/trunk 476a251e5 -> 4c9c3955a
HDFS-9237. NPE at TestDataNodeVolumeFailureToleration#tearDown. Contributed by Brahma Reddy Battula. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4c9c3955 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4c9c3955 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4c9c3955 Branch: refs/heads/trunk Commit: 4c9c3955ae6cb5c3b67c8127eb7fa5449a0286d9 Parents: 476a251 Author: Tsuyoshi Ozawa <[email protected]> Authored: Mon Oct 19 15:30:21 2015 +0900 Committer: Tsuyoshi Ozawa <[email protected]> Committed: Mon Oct 19 15:30:21 2015 +0900 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../server/datanode/TestDataNodeVolumeFailureToleration.java | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c9c3955/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index f6cee76..3edbfba 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -2074,6 +2074,9 @@ Release 2.8.0 - UNRELEASED HDFS-9157. [OEV and OIV] : Unnecessary parsing for mandatory arguements if '-h' option is specified as the only option (nijel via vinayakumarb) + HDFS-9237. NPE at TestDataNodeVolumeFailureToleration#tearDown. + (Brahma Reddy Battula via ozawa) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c9c3955/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureToleration.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureToleration.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureToleration.java index 5b7ac30..32a439d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureToleration.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureToleration.java @@ -76,7 +76,9 @@ public class TestDataNodeVolumeFailureToleration { @After public void tearDown() throws Exception { - cluster.shutdown(); + if (cluster != null) { + cluster.shutdown(); + } } /**
