HDFS-7517. Remove redundant non-null checks in FSNamesystem#getBlockLocations. Contributed by Haohui Mai.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/46612c7a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/46612c7a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/46612c7a Branch: refs/heads/YARN-2139 Commit: 46612c7a5135d20b20403780b47dd00654aab057 Parents: 3681de2 Author: Haohui Mai <whe...@apache.org> Authored: Fri Dec 12 11:51:17 2014 -0800 Committer: Haohui Mai <whe...@apache.org> Committed: Fri Dec 12 11:51:17 2014 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/46612c7a/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 5977ed7..9cd5b05 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -579,6 +579,9 @@ Release 2.7.0 - UNRELEASED HDFS-7497. Inconsistent report of decommissioning DataNodes between dfsadmin and NameNode webui. (Yongjun Zhang via wang) + HDFS-7517. Remove redundant non-null checks in FSNamesystem# + getBlockLocations. (wheat9) + Release 2.6.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/46612c7a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java index c17c4f5..5dd5920 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java @@ -1782,10 +1782,6 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean, logAuditEvent(true, "open", src); - if (res == null) { - return null; - } - if (res.updateAccessTime()) { writeLock(); final long now = now();