You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sh...@apache.org on 2015/01/25 02:37:30 UTC
[05/10] hadoop git commit: HDFS-7606. Fix potential NPE in
INodeFile.getBlocks(). Contributed by Byron Wong.
HDFS-7606. Fix potential NPE in INodeFile.getBlocks(). Contributed by Byron Wong.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a116e1fe
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a116e1fe
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a116e1fe
Branch: refs/heads/branch-2
Commit: a116e1fe9e7ad929a81502757e6fa2c28df394af
Parents: 00a7eba
Author: Konstantin V Shvachko <sh...@apache.org>
Authored: Sat Jan 24 16:16:58 2015 -0800
Committer: Konstantin V Shvachko <sh...@apache.org>
Committed: Sat Jan 24 16:16:58 2015 -0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++
.../java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a116e1fe/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 3c33e36..790b0a6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -487,6 +487,8 @@ Release 2.7.0 - UNRELEASED
HDFS-7644. minor typo in HttpFS doc (Charles Lamb via aw)
+ HDFS-7606. Fix potential NPE in INodeFile.getBlocks(). (Byron Wong via shv)
+
Release 2.6.1 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a116e1fe/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java
index 0bbfd72..f4c2736 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java
@@ -432,7 +432,7 @@ public class INodeFile extends INodeWithAdditionalFields
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;
}