big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-7606. Fix potential NPE in INodeFile.getBlocks(). Contributed by Byron Wong.

Browse Source
This commit is contained in:
Konstantin V Shvachko 2015-01-16 14:31:18 -08:00
parent ec4389cf72
commit 60cbcff2f7
2 changed files with 3 additions and 1 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

@ -270,6 +270,8 @@ Trunk (Unreleased)
HDFS-7581. HDFS documentation needs updating post-shell rewrite (aw)
HDFS-7606. Fix potential NPE in INodeFile.getBlocks(). (Byron Wong via shv)
Release 2.7.0 - UNRELEASED
INCOMPATIBLE CHANGES

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java
View File

@ -432,7 +432,7 @@ public BlockInfo[] getBlocks(int snapshot) {
return snapshotBlocks;
// Blocks are not in the current snapshot
// Find next snapshot with blocks present or return current file blocks
snapshotBlocks = getDiffs().findLaterSnapshotBlocks(diff.getSnapshotId());
snapshotBlocks = getDiffs().findLaterSnapshotBlocks(snapshot);
return (snapshotBlocks == null) ? getBlocks() : snapshotBlocks;
}