Skip to content

Commit 57c272b

Browse files
authored
Merge pull request #186 from DSL-UMD/distributed
[FIX] An edge case
2 parents ddf7b35 + 96756c2 commit 57c272b

File tree

1 file changed

+2
-0
lines changed
  • hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode

1 file changed

+2
-0
lines changed

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeMap.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ public INode get(long id) {
5757
INode inode = INodeKeyedObjects.getCache().getIfPresent(Long.class, id);
5858
if (inode == null) {
5959
DatabaseINode.LoadINode node = new DatabaseINode().loadINode(id);
60+
if (node == null) return null;
6061
byte[] name = (node.name != null && node.name.length() > 0) ? DFSUtil.string2Bytes(node.name) : null;
6162
if (node.header != 0L) {
6263
inode = new INodeFile(node.id);
@@ -98,6 +99,7 @@ public INode get(long parentId, String childName) {
9899
.getIfPresent(Pair.class, new ImmutablePair<>((Long) parentId, childName));
99100
if (inode == null) {
100101
DatabaseINode.LoadINode node = new DatabaseINode().loadINode(parentId, childName);
102+
if (node == null) return null;
101103
byte[] name = (node.name != null && node.name.length() > 0) ? DFSUtil.string2Bytes(node.name) : null;
102104
if (node.header != 0L) {
103105
inode = new INodeFile(node.id);

0 commit comments

Comments
 (0)