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

HDFS-8548. Minicluster throws NPE on shutdown. Contributed by surendra singh lilhore.

Browse Source 
(cherry picked from commit 6a76250b39f33466bdc8dabab33070c90aa1a389)
This commit is contained in:
Xiaoyu Yao 2015-06-16 13:52:50 -07:00
parent d2d038b0a0
commit 8ab23d9ec1
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -560,6 +560,9 @@ Release 2.8.0 - UNRELEASED
HDFS-8592. SafeModeException never get unwrapped. (wheat9)
HDFS-8548. Minicluster throws NPE on shutdown.
(surendra singh lilhore via xyao)
Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES

6
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlocksMap.java
View File

@ -198,7 +198,11 @@ boolean removeNode(Block b, DatanodeDescriptor node) {
}
int size() {
return blocks.size();
if (blocks != null) {
return blocks.size();
} else {
return 0;
}
}
Iterable<BlockInfo> getBlocks() {