Repository: hadoop Updated Branches: refs/heads/branch-2.7 fe08ba439 -> 97e79662b
HDFS-8548. Minicluster throws NPE on shutdown. Contributed by surendra singh lilhore. (cherry picked from commit 6a76250b39f33466bdc8dabab33070c90aa1a389) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/97e79662 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/97e79662 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/97e79662 Branch: refs/heads/branch-2.7 Commit: 97e79662b6aea1f5ae952058736c5254d0d7fa48 Parents: fe08ba4 Author: Xiaoyu Yao <x...@apache.org> Authored: Tue Jun 16 13:52:50 2015 -0700 Committer: Xiaoyu Yao <x...@apache.org> Committed: Fri Jun 3 12:55:31 2016 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../apache/hadoop/hdfs/server/blockmanagement/BlocksMap.java | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/97e79662/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 898777e..26bb1e5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -181,6 +181,9 @@ Release 2.7.3 - UNRELEASED HDFS-9476. TestDFSUpgradeFromImage#testUpgradeFromRel1BBWImage occasionally fail. (Masatake Iwasaki via aajisaka) + HDFS-8548. Minicluster throws NPE on shutdown. + (surendra singh lilhore via xyao) + Release 2.7.2 - 2016-01-25 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/97e79662/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlocksMap.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlocksMap.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlocksMap.java index 806a4cb..9a45b8c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlocksMap.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlocksMap.java @@ -200,7 +200,11 @@ class BlocksMap { } int size() { - return blocks.size(); + if (blocks != null) { + return blocks.size(); + } else { + return 0; + } } Iterable<BlockInfoContiguous> getBlocks() { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org